Merge branch 'hotfix/1.4.2' v1.4.2
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Feb 2016 19:41:55 +0000 (14:41 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Feb 2016 19:41:55 +0000 (14:41 -0500)
commitc534ca48e9f0254658db9f7b2683b697ed93cda2
treeaeccba3cbefa5e2b87fc0ef65577391333549348
parent27b39bbe80ad16911e88ae59275634d1f6f43323
parent87f5bf2153b514ec23a4c70c39eca525def7ceb0
Merge branch 'hotfix/1.4.2'