Merge tag 'v1.2' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Feb 2016 19:00:17 +0000 (14:00 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Feb 2016 19:00:17 +0000 (14:00 -0500)
commitb35f95010c2fc18a441c386d88d7143c21e6f960
tree52dade0a093ca18aed87f80e3bc6af3de9c87f3d
parent0e3b4adff0bd207d8b19313dcc80efc7573705d2
parentc3a721e3efd9dee9f344ff76b16f3c86f1c27aee
Merge tag 'v1.2' into develop

Version 1.2