Merge branch 'hotfix/1.1.4' v1.1.4
authorLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 19:23:48 +0000 (15:23 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 19:23:48 +0000 (15:23 -0400)
commit92c81aa58c5ad9bf2a34bdda346294fcb9e9d4d3
treeead29090e05f5fe0638dc232aacd645877df195a
parentefbe86aa273eb031188f60a2ea3f191c08935133
parent85417a053a43b40eb2393d48868a7a92ec2cc75b
Merge branch 'hotfix/1.1.4'