Merge tag 'v1.2.1' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Dec 2016 16:31:33 +0000 (11:31 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Dec 2016 16:31:33 +0000 (11:31 -0500)
commit8857d10f5bef4d083ef52887f63f45552efb5e39
tree6f6dc11ad162ed96c8dbed5cfbc9b402716246ed
parent5a34eaf2ee439c1116121ce0ca2439c908be8e82
parent1446b003b7f68ed75de64d19b17685808b125ef0
Merge tag 'v1.2.1' into develop

Version 1.2.1