erge tag 'v1.0.7' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Jan 2016 16:42:41 +0000 (11:42 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Jan 2016 16:42:41 +0000 (11:42 -0500)
Version 1.0.7


Trivial merge