Merge branch 'hotfix/1.0.29'
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 12 Aug 2016 12:38:55 +0000 (08:38 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 12 Aug 2016 12:38:55 +0000 (08:38 -0400)
commit504759e9ba1589173b1d6dc1c9f01270fce85891
treebc8b2df5fc9e03b4d1827ecb8863c496a408fcc8
parent53f28a88a365661d9e95282e756fc21752d0de3a
parent723536e8a6c3dc2b8a3aa48a334d06769b834b51
Merge branch 'hotfix/1.0.29'