Merge branch 'release/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 26 Oct 2015 15:06:38 +0000 (11:06 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 26 Oct 2015 15:06:38 +0000 (11:06 -0400)
commite32a4b4b78dd35b5a91356729860f579ff5b0e4a
tree8350e93da591f1c3e98d80eaf29ab2024db14405
parent2fe347231a04f420094a4dda60689a001587feba
parenta25c8b4e42be815cf768c184d99f1cf64297bccd
Merge branch 'release/1.0.4'