Merge tag 'v1.0.6' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 16:04:00 +0000 (12:04 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 16:04:00 +0000 (12:04 -0400)
Version 1.0.6


Trivial merge