Merge branch 'hotfix/1.1.29'
authorLaury GvR <laury@gaslightmedia.com>
Thu, 16 Jun 2016 18:32:23 +0000 (14:32 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 16 Jun 2016 18:32:23 +0000 (14:32 -0400)
commit298bdd08b2195d979d7a62fe664d78f85402f80c
tree81afec5bd1811fea80ca1ecf70dc82803086c41a
parent8dd325419854b7cf16e88886c144511c15a4f0f2
parentbe25634fd6eddedef2490adeddae8116894fbe2e
Merge branch 'hotfix/1.1.29'