Merge branch 'hotfix/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 22 Sep 2014 15:05:13 +0000 (11:05 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 22 Sep 2014 15:05:13 +0000 (11:05 -0400)
commit21d9e951d3ce914be2f162711f0f6a255d06dc64
tree53df2d0f8869f1fe611a698647fa7242354438b4
parent4bed62da3fa0d5e216d5f2891f410057fc831f07
parent73bfbbc826731bd710317fa0183fa7468414cbf5
Merge branch 'hotfix/1.0.5'