Merge tag 'v1.1.26' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 30 Dec 2015 21:17:25 +0000 (16:17 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 30 Dec 2015 21:17:25 +0000 (16:17 -0500)
Version 1.1.26


Trivial merge