Merge branch 'hotfix/1.0.22' v1.0.22
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Aug 2014 12:46:54 +0000 (08:46 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Aug 2014 12:46:54 +0000 (08:46 -0400)
commitb25ee64e6b8caa93fb5bd9b4cb213b395935efe8
treeb6b73b744d97a631b765fb5aee776b48fcadaec4
parent42d8c6e4023199ebbcc6e00f34a3f14ff987b6e4
parent0a3258fccdf030ceb171d463d1cc9e3e23f54c0c
Merge branch 'hotfix/1.0.22'