Merge branch 'hotfix/1.0.2' v1.0.2
authorLaury GvR <laury@gaslightmedia.com>
Fri, 30 Oct 2015 13:18:29 +0000 (09:18 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 30 Oct 2015 13:18:29 +0000 (09:18 -0400)
commit00937a8c15132678aec3ae40bce78d7b2667a4d1
tree5df91388222ec693b4cf76785ba2b07f537c8173
parent8ab35461fd20d5802a66d21fcb6599677e3a93fe
parent255d9b5d43570d51e3dc8b0f7554d03656362d1c
Merge branch 'hotfix/1.0.2'