Merge branch 'hotfix/1.2.26' v1.2.26
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Jul 2016 20:15:24 +0000 (16:15 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Jul 2016 20:15:24 +0000 (16:15 -0400)
commit8f7e52ee5f0d810b56cd68291a91e2f652fed781
treeb8507a40c585a6de6ec9957723dbe70e2470a816
parentf6bdc772fe25912b56b61825096ac8c995b57d73
parent7084983606bee9b2d8ceff447bb702805512132e
Merge branch 'hotfix/1.2.26'