Merge branch 'hotfix/1.0.25' v1.0.25
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Aug 2014 12:53:25 +0000 (08:53 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Aug 2014 12:53:25 +0000 (08:53 -0400)
commitce8681d30ac7b60456988d9f21542433c24ac800
tree8a904d83a2c2e10dc4f243731e17792cb598d361
parentb25ee64e6b8caa93fb5bd9b4cb213b395935efe8
parent0da5105eb67e342647b8e3874123232300bc9331
Merge branch 'hotfix/1.0.25'