Merge branch 'hotfix/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 29 Jul 2014 17:37:01 +0000 (13:37 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 29 Jul 2014 17:37:01 +0000 (13:37 -0400)
commit76671dd5ce42f63e7cb445852ba556734ed42821
treea4c07cd9668e5c971d78dd33dd7179ea3460d8b5
parentc7bf69dfcccc8af8151cd51cb742d03d1772eedf
parent53aa1b4502587717f083b801cbce3bc81ed5f0b7
Merge branch 'hotfix/1.0.5'