Merge branch 'hotfix/1.1.1' v1.1.1
authorLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 18:14:01 +0000 (13:14 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 18:14:01 +0000 (13:14 -0500)
commit9583f78a1f286e05baf402e6765d3f9dbc74ff1d
tree1be54cb4e89e41eeb9f6381513ad01eea3a622a2
parentc4c4be5943e7936afd4909af37f9537491830c3a
parentd37f1b1691f84d3e8ba21bd28d2e015dad8a54db
Merge branch 'hotfix/1.1.1'