Merge branch 'hotfix/1.4.1' v1.4.1
authorLaury GvR <laury@gaslightmedia.com>
Thu, 30 Apr 2015 16:20:21 +0000 (12:20 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 30 Apr 2015 16:20:21 +0000 (12:20 -0400)
commitd2ca1e7eb11b2551bafb35358f5f178ebc705f43
tree33bb5b4161ab3e02344ba67d9f39d29dbf5e60c3
parentbf9821d84f76489651b6f7f8985e32a107b1fbeb
parentb3c724a2b931e6bafbc05a43741dd3ab30dfad92
Merge branch 'hotfix/1.4.1'