Merge branch 'release/1.3.0' v1.3.0
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 23 Mar 2015 16:32:52 +0000 (12:32 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 23 Mar 2015 16:32:52 +0000 (12:32 -0400)

Trivial merge