Merge branch 'hotfix/1.1.3' v1.1.3
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Aug 2014 12:52:25 +0000 (08:52 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Aug 2014 12:52:25 +0000 (08:52 -0400)

Trivial merge