Merge branch 'hotfix/1.0.39' v1.0.39
authorLaury GvR <laury@gaslightmedia.com>
Fri, 22 Apr 2016 16:06:54 +0000 (12:06 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 22 Apr 2016 16:06:54 +0000 (12:06 -0400)
commit36f975ef28194466cba9eaabffcf36be82367cd9
tree33e043041ce57238699e4fd985e231b1efe3052a
parentfb00c214f946136486296b563c5288db1e98d9e6
parentf94367c5c385f73fd9684462b00cbf6e01834b20
Merge branch 'hotfix/1.0.39'