Merge branch 'hotfix/1.0.14' v1.0.14
authorLaury GvR <laury@gaslightmedia.com>
Fri, 25 Sep 2015 18:02:39 +0000 (14:02 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 25 Sep 2015 18:02:39 +0000 (14:02 -0400)
commit5702cb0cdce7ee0227966972573197933e56f04c
treeda0e1beafab2e55f4eabbd5f2696b902b3cb7712
parente8ae3918cc60418ac39c8a7e8a21473858776830
parentdd0d74672cf3f07cf0543c7e4ca831e4b3e1e272
Merge branch 'hotfix/1.0.14'