Merge branch 'hotfix/1.0.13' v1.0.13
authorLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 18:43:48 +0000 (14:43 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 18:43:48 +0000 (14:43 -0400)
commitfdef2e7e29ea6992af2bed234bdfb19a2731bfc5
tree55dd47322fc4d7265c1803da7898d1076bc9e2b3
parentfbc5385672e5440679e0f5fc516dcad6f197f50e
parent93e818fd96b3efd9e63e2acfe43d6c0323101857
Merge branch 'hotfix/1.0.13'