Merge branch 'release/1.0.4' v1.0.4
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 4 Sep 2015 16:14:52 +0000 (12:14 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 4 Sep 2015 16:14:52 +0000 (12:14 -0400)
commit14d1ae374d98e2cd0bb2f6958a9137a765da223b
tree413a953b7179838996c895019d31047242c93063
parente4b262874f1a81c61a45449911eb72a8cd32f624
parent3701278381a82dd4421e52a6cea4ccd9859082a6
Merge branch 'release/1.0.4'