Merge branch 'release/2.6.0' v2.6.0
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 22 Sep 2016 17:34:47 +0000 (13:34 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 22 Sep 2016 17:34:47 +0000 (13:34 -0400)
commit8f517e98707159eb0e665ee88e639969d7fb00ca
treeb070ba46ca1d3bf4c35256841022f49fa5dfed1b
parent6c02a296f80425e9d8584cc9ab6cf4fb94c27caf
parent41b7c7c3e58a239204a37f507eb7a38dbc991b77
Merge branch 'release/2.6.0'