Merge branch 'hotfix/2.1.2' v2.1.2
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 15 Jun 2016 19:04:44 +0000 (15:04 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 15 Jun 2016 19:04:44 +0000 (15:04 -0400)
commit920bfc853e9f064c13e3e840452d38da43f0ab84
tree96b8e6d5b9e50b0eabfde323f319f532075f9a0f
parent964b20e5c00bcb74b394275760002d7be23ac272
parent9e80d16af5b794666b0e78b03f9734f1e66b48d2
Merge branch 'hotfix/2.1.2'