Merge branch 'release/1.6.0' v1.6.0
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 9 Jan 2017 20:24:07 +0000 (15:24 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 9 Jan 2017 20:24:07 +0000 (15:24 -0500)
commit9a36eb514350fcf43515e2fa4e3ffc357db93f1e
tree0f6648a4462e1bd627e07505ff6a3e54f1b93954
parent4eafe1eb55ce076cec3b2f779e56ea8b79020f35
parent6689d02b212fc261c6e7474de996b0de30d8957f
Merge branch 'release/1.6.0'