release-2.6.0
eb02a97e
·
merge default into release
·
May 31, 2015