Merge branch 'release/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Jun 2015 21:50:04 +0000 (17:50 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Jun 2015 21:50:04 +0000 (17:50 -0400)
commit749d6b9e27df32ee35d31d1043a3d584a069835f
treebbb47c0b6bbf67fbe28b2a45d35994f4bd0aeafe
parent8d395137159fd719473063cbe7610aab7375dcd2
parent65fbb313cc4f22a15cd0bf74dd01b97cc9eefa6f
Merge branch 'release/1.0.4'