Merge branch 'release/1.2.6' v1.2.6
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 13 Feb 2017 20:14:30 +0000 (15:14 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 13 Feb 2017 20:14:30 +0000 (15:14 -0500)
commite7c0454cd7cd894b669833aa273b02f215b12072
tree526d4d55328a5872dfc6fb45f100e7f43d8724b7
parente18d8079c0b999c5e5574c46e97e75c5df65e4d5
parent4061e680ee1a0c4377dbc43201b0388e4237d976
Merge branch 'release/1.2.6'