Merge branch 'hotfix/1.0.15' v1.0.15
authorLaury GvR <laury@gaslightmedia.com>
Tue, 5 Jan 2016 19:07:16 +0000 (14:07 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 5 Jan 2016 19:07:16 +0000 (14:07 -0500)
commit1df40565a614f84cc562548ae117ed1f0b9e3b81
treed058700dd2f112e70b412a205bd23ee8c7129e22
parent7207e36e2ce21687ab7d2800cd601d8fe550d286
parentbde70a0bc5daf787862c67242f3fae9eee7afb43
Merge branch 'hotfix/1.0.15'