Merge branch 'hotfix/1.0.4' v1.0.4
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 11 Dec 2015 21:49:00 +0000 (16:49 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 11 Dec 2015 21:49:00 +0000 (16:49 -0500)
commit32ea400575835bbda6255e3c4f2adc54a6fc6396
tree96a78a095d72dc155901d1ef3049815b9d99aa16
parentdc69599b14be7ffbc22288a7a65cd1ab63bdbb15
parenta5601887d9b43b52f9f21013d0f67743a444bbb9
Merge branch 'hotfix/1.0.4'