Merge branch 'hotfix/1.1.4' v1.1.4
authorLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 16:11:04 +0000 (12:11 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 16:11:04 +0000 (12:11 -0400)
commitbedb0584d72be9ed056b4cbcf700ed916d3a3306
tree244ea6c1e7ff2b6a9909298ee831c0245af29a1d
parent8ffff1af8fb8f956fba4cfd6f8c8f2c4dc8f3d5a
parent1ceb640a8f58bf78e360bb25efb40bdfc17e5712
Merge branch 'hotfix/1.1.4'