Merge branch 'hotfix/1.0.7' v1.0.7
authorLaury GvR <laury@gaslightmedia.com>
Mon, 11 Jan 2016 17:00:22 +0000 (12:00 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 11 Jan 2016 17:00:22 +0000 (12:00 -0500)
commit533b8e65a75cbcdfd3765832f505db0a4a13f596
treee04108651d67d0a70a19acdbb41b878478822c8e
parent6d56fc19cdae1e74cf750c8398c0fb09b9b67069
parent454b4c17dda7fac71ccce82d1fb6c3d1a46088d8
Merge branch 'hotfix/1.0.7'