Merge branch 'release/1.0.4' v1.0.4
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 27 Sep 2016 20:33:45 +0000 (16:33 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 27 Sep 2016 20:33:45 +0000 (16:33 -0400)
commit6a6df96bf1015ab23e49333d6d600acde210d791
tree08937f94d9a9f794a3dad55579ef06c265b43593
parentd7d8db8a0f2b1a3320bad9e5b29e372b9c562aea
parent2d2fc38e521ae3a29a4bda016ef6fbbdf3b51147
Merge branch 'release/1.0.4'