Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 20:13:33 +0000 (15:13 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 20:13:33 +0000 (15:13 -0500)
commite21cb5bde718c94be1317c83923de9691772c851
tree256ce52a17d0a4794221652adeccd13f08835386
parent3198d4298684e4c8ead5d8d9a936411845828d8e
parent626bcbf5b55c88acf1eae00f168fb83fcff2eefd
Merge branch 'hotfix/1.0.5'