Merge branch 'hotfix/1.0.1'
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 26 Oct 2015 12:57:53 +0000 (08:57 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 26 Oct 2015 12:57:53 +0000 (08:57 -0400)
commit59fc4e50bd803b38e9ba9fe2328d09b1ba4965e9
tree4ed4a5005199e5bc3161362b0d627eca3534c59a
parent9b6b511457ed5d17197e603bc87a89c5e3842ea6
parent4a5e7cc0f94fadd7e4d775a32edaf27f4cccc693
Merge branch 'hotfix/1.0.1'