Merge branch 'release/1.2.4' v1.2.4
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 30 Oct 2015 15:27:32 +0000 (11:27 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 30 Oct 2015 15:27:32 +0000 (11:27 -0400)
commitfa73010e8e398f42ce73a12d5ebf111c7d26d8c1
tree6ed5180bcea4d2cb300822c48123ff27a25a9b3d
parentd52ea5bd6aa68b0b2e3620ecac97ef0d52565c0b
parentf2bbabb307e810eaeb233681413dbd91827fff74
Merge branch 'release/1.2.4'