Merge tag 'v1.1.0' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Apr 2016 15:45:11 +0000 (11:45 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Apr 2016 15:45:11 +0000 (11:45 -0400)
Version 1.1.0


Trivial merge