Merge branch 'hotfix/1.1.8' v1.1.8
authorLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 19:00:56 +0000 (15:00 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 19:00:56 +0000 (15:00 -0400)
commit1baab0333b1748a2655dfb0025848d2e6b35076c
treefb548dc1ebd4ef2b3ddfef86a6b5342499b7a766
parentee3883a802902b5b5b1b4e2082932b7f1f4cf621
parent06706a91e1334bdf0dbf59d46deba8dc72e84142
Merge branch 'hotfix/1.1.8'