Merge branch 'release/1.2.0' v1.2.0
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 31 Dec 2015 19:34:11 +0000 (14:34 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 31 Dec 2015 19:34:11 +0000 (14:34 -0500)
commit186e039d040a9b68f12755944e678adbdbe51703
tree85f7e44328b5d8e46d913525399f7992971387d6
parentd01159af294e02c25d40a96063b655ae9e466664
parent67c8552c648490ea80b7761169ce694313dc6943
Merge branch 'release/1.2.0'