Merge branch 'hotfix/1.2.23' v1.2.23
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Jul 2016 12:11:59 +0000 (08:11 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Jul 2016 12:11:59 +0000 (08:11 -0400)
commit49531b60caaff9f35dfcf127d8d2ff7351e09f8e
treecf978e166c31a42bef37aebb502539519999b8e9
parent7166aed8a9abd41a4baa1c706769a8ba8ef1597c
parentaf986e7a7716e9d8e7b28d4defb1b1ba17709c7a
Merge branch 'hotfix/1.2.23'