Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 17:44:13 +0000 (13:44 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 17:44:13 +0000 (13:44 -0400)
commit65617c9e735b546e4d921b4f972df90ccbd18e2f
treec30d2b70947e02d9343485de7d9956c16cb67ad6
parentaac7e98221f212d569d849f89faa2f61dc937e7d
parent58971b9d61663ad5f8e479cd6be8d9ee744789e5
Merge branch 'hotfix/1.0.5'