Merge tag 'v1.2.26' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Jul 2016 20:15:35 +0000 (16:15 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Jul 2016 20:15:35 +0000 (16:15 -0400)
commitaa164c5ac2c62478b98f7db5b5438332431f5b55
treeb8507a40c585a6de6ec9957723dbe70e2470a816
parent491b5bfcd34aa693aac36afeb8e447f7ae71310e
parent8f7e52ee5f0d810b56cd68291a91e2f652fed781
Merge tag 'v1.2.26' into develop

Version 1.2.26