Merge branch 'hotfix/1.2.24' v1.2.24 v1.2.25
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Jul 2016 12:15:40 +0000 (08:15 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Jul 2016 12:15:40 +0000 (08:15 -0400)
commitf6bdc772fe25912b56b61825096ac8c995b57d73
tree287ebfbee16279148ef91e3f013fc5b36f481a9e
parent49531b60caaff9f35dfcf127d8d2ff7351e09f8e
parent4027918edd1ff0954204f724c45dc5fa135d6ae8
Merge branch 'hotfix/1.2.24'