Merge branch 'hotfix/1.0.26' v1.0.26
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Aug 2014 13:51:58 +0000 (09:51 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Aug 2014 13:51:58 +0000 (09:51 -0400)
commitabfebf60aab7bb00fd5524c97f21a1d2402114ca
tree39274193168cdc457f93cb1866b26d30a39bc43b
parentce8681d30ac7b60456988d9f21542433c24ac800
parentb3f83d2ab8ef78854f80238a307dd8d65becbcf2
Merge branch 'hotfix/1.0.26'