Merge tag 'v1.2.0' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 31 Dec 2015 19:34:21 +0000 (14:34 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 31 Dec 2015 19:34:21 +0000 (14:34 -0500)
commit7b74e6df1eac5965c5a9c1e6bf70e461446d8ae3
tree85f7e44328b5d8e46d913525399f7992971387d6
parentcd140e3f8e90e27eb24946bf2269b216fd82906a
parent186e039d040a9b68f12755944e678adbdbe51703
Merge tag 'v1.2.0' into develop

Version 1.2.0