Add verifyPassword from @Hackwar. Bring in PHPass.
Use hashPassword on user update / create, not just on login.
hashPassword on frontend password reset.
Use hashPassword in the installation application.
Prepare 2.5.17 release
Prepare 2.5.18 development
docs folder was accidentally packaged
Update en-GB.com_users.ini

Same as master / staging see:
https://github.com/joomla/joomla-cms/commit/7b6ff99d26048e3c0e3a2cc1c66c49a0d6d3a7b1
Merge pull request #2705 from zero-24/patch-5

$ Correcting typo in language string [2.5.x]
Updating Copyright to 2014
[#33055] If pagebreak added to article a Notice: Undefined property:
stdClass::$toc in pagebreak.php is created
Removing `else` so the fallbacks indeed get used
Merge pull request #2786 from Bakual/FixRouteHelper

Tracker #33011 Removing `else` so the fallbacks indeed get used
[#30901] Articles missing for admins in front end
Thanks Roberto.
Correction
Merge pull request #2798 from infograf768/30901

[#30901] Articles missing for admins in front end
Update installer.php

Tracker: #33154
http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemEdit&tracker_id=8103&tracker_item_id=33154
Merge pull request #2806 from zero-24/patch-4

Manifest install sql file with whitespace fails
Merge pull request #2683 from dongilbert/25PasswordSecurity

Password Security: PHPass for Joomla! 2.5