Marco Peereboom Prepare for release 2.5.0.

Latest commit f7822a2

Dec 11, 2012