Merge branch 'release/1.1.30' v1.1.30
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 3 Sep 2014 16:03:07 +0000 (12:03 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 3 Sep 2014 16:03:07 +0000 (12:03 -0400)

Trivial merge