Merge branch 'release/1.2' v1.2
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 9 Oct 2014 14:47:17 +0000 (10:47 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 9 Oct 2014 14:47:17 +0000 (10:47 -0400)

Trivial merge