Merge tag 'v1.1.0' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Jan 2016 19:41:09 +0000 (14:41 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Jan 2016 19:41:09 +0000 (14:41 -0500)
Version 1.1.0


Trivial merge