Merge branch 'hotfix/1.0.4' 1.0.4
authorcscott <cscott@gaslightmedia.com>
Fri, 5 Sep 2014 20:23:18 +0000 (16:23 -0400)
committercscott <cscott@gaslightmedia.com>
Fri, 5 Sep 2014 20:23:18 +0000 (16:23 -0400)
commit5abd174d99085bcdbe67d0f5f8d87a7c5ead20e5
tree5c70d8d09da754feedebb40301885c5db4f3f418
parented7229af77f42133dc2f2510c25c918a4d9dbe67
parentad986e8a47ce42891a427cae65aba926b532244f
Merge branch 'hotfix/1.0.4'