Merge tag 'v2.6.0' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 22 Sep 2016 17:34:56 +0000 (13:34 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 22 Sep 2016 17:34:56 +0000 (13:34 -0400)
commita80ad8ec9ed1628bd25d6a24ac9cdab707de3042
treeb070ba46ca1d3bf4c35256841022f49fa5dfed1b
parente740468f7bf511208dc80cd203b8e1b873ecef14
parent8f517e98707159eb0e665ee88e639969d7fb00ca
Merge tag 'v2.6.0' into develop

Version 2.6.0