Merge branch 'hotfix/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 15:28:51 +0000 (11:28 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 15:28:51 +0000 (11:28 -0400)
commit8da21c43eabe0235fd2a8a3a4de1ebb0325dc849
tree28a1a77343462740b41f2dd4b3cd9e1d52f4802c
parent7d99a19dc0e2751930f4d9c0f7b71b1632d06bf8
parent6211f762dd78498839fff4974080eb4711b523ef
Merge branch 'hotfix/1.0.4'