Merge branch 'hotfix/1.0.15' V1.0.15
authorLaury GvR <laury@gaslightmedia.com>
Wed, 20 Aug 2014 21:03:04 +0000 (17:03 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 20 Aug 2014 21:03:04 +0000 (17:03 -0400)
commitd226ba68c133e11cffe5ad7741bf913efaeaaf0b
tree109181e17bb634d590faa9040643cea0a3a59490
parentd20d2d0fc03bf6d0d85bec6646c28dabeef5d1f3
parent623e6ab3ba87165dd50ff0c0b31daefaecf80b79
Merge branch 'hotfix/1.0.15'