Merge branch 'release/2.6.1' v2.6.1
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 22 Sep 2016 21:03:21 +0000 (17:03 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 22 Sep 2016 21:03:21 +0000 (17:03 -0400)
commit8397ee93876293c190ab0408ceb50df4d2fec22b
treeaae4bd587a3912e61b47649e5ffb6f86f2c920c4
parent8f517e98707159eb0e665ee88e639969d7fb00ca
parent5610a538e94962ba85c07f2ff07110ed10d930b0
Merge branch 'release/2.6.1'