Merge branch 'hotfix/1.1.30' v1.1.30
authorLaury GvR <laury@gaslightmedia.com>
Thu, 16 Apr 2015 14:16:52 +0000 (10:16 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 16 Apr 2015 14:16:52 +0000 (10:16 -0400)
commitf46cebd8e9954a0fd88f90f22372ae9a0c8cd3d1
tree2f5ffa982afac7c1a2149ff81c71adbb0aa47a50
parent199d831384a0f4b8f90faad714264ab9dae37697
parent0536311e3ccaf0cc2dcf8ef995b68f68cec57dcc
Merge branch 'hotfix/1.1.30'