Merge branch 'hotfix/1.1.17'
authorLaury GvR <laury@gaslightmedia.com>
Thu, 3 Dec 2015 19:15:11 +0000 (14:15 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 3 Dec 2015 19:15:11 +0000 (14:15 -0500)
commit71c840e6ab929e9e2f85e7df6346f29bfad2b88c
tree9e8ab898893ea05e1528d312fe1ead7ef2e32798
parentf341dd85461a0794005a79933e4fd81fa425f63b
parentd41884b7a34d4c2aa802990eaf7155fe02096b50
Merge branch 'hotfix/1.1.17'