2.6.0

svn path=/trunk/; revision=2228
This tag has no release notes.