Merge branch 'hotfix/1.1.4' v1.1.4
authorLaury GvR <laury@gaslightmedia.com>
Mon, 30 Nov 2015 13:57:45 +0000 (08:57 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 30 Nov 2015 13:57:45 +0000 (08:57 -0500)
commit49d19d60b634e4234ef10e8dcfe963fe5ceb8f59
treeed2f31f7994f9b8799a067b242da7c3457276e09
parentd3c5b89b3c0208110dc12ffb4c0ceb3162970c5f
parentcae3bcf863b1f0f86be9f86d3b069dfe2ccc8b98
Merge branch 'hotfix/1.1.4'