Merge branch 'hotfix/1.1.32'
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 19:17:10 +0000 (15:17 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 19:17:10 +0000 (15:17 -0400)
commit571eaace6a67c60ee5d6f9a637293e7b1060c570
tree26092c50540fcccf7da7f237675cadf7774a7e8f
parent17a8a8d984c389cf715cf73b38d34753b22e9ef3
parent4ace18266856a0761c39c73ad8d13731f71e79d0
Merge branch 'hotfix/1.1.32'