Merge branch 'hotfix/1.1.6' v1.1.6
authorLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 18:36:02 +0000 (14:36 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 18:36:02 +0000 (14:36 -0400)
commitf0ae5b23e15b693f7d379eaa4958679064215a2d
treeca39c721e614ec5daad0876fcd3f27552b7e8734
parent90b8e5e5b8728f29ed0645c96b23cac21b979305
parent389dc8dd804aec628b44b38d4e111b4f868d1872
Merge branch 'hotfix/1.1.6'