Merge tag 'v1.3.0' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 23 Mar 2015 16:33:00 +0000 (12:33 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 23 Mar 2015 16:33:00 +0000 (12:33 -0400)
Version 1.3.0


Trivial merge