Merge branch 'hotfix/1.4.2' v1.4.2
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Jun 2015 18:56:38 +0000 (14:56 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Jun 2015 18:56:38 +0000 (14:56 -0400)
commitc31b8fbbd64b9290df30d6300ce89277dc5c37c2
tree02a0c7c2ed3f05dea59f96d40b9c8a4de47a5cd6
parentd2ca1e7eb11b2551bafb35358f5f178ebc705f43
parent410a0d1110d076ca109e5d990ea9dcc265de782e
Merge branch 'hotfix/1.4.2'