Merge branch 'hotfix/1.1.1' v1.1.1
authorLaury GvR <laury@gaslightmedia.com>
Fri, 10 Apr 2015 19:47:20 +0000 (15:47 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 10 Apr 2015 19:47:20 +0000 (15:47 -0400)
commit86d3909c56ebd7b98c702abd64f4d9d730125312
tree55149f1705ac907ad7d6c8b4b4a4d4735af38ce7
parent78d401c9eee1d0df7c618cf28ef2f94fbf1cb607
parent88d9e8d5385710ab09995726c8c0998fefcb4dff
Merge branch 'hotfix/1.1.1'