From d46a762159f7b7c97b24c9dfacc0b985e48fa3e1 Mon Sep 17 00:00:00 2001
From: Jack Christensen <jack@jackchristensen.com>
Date: Wed, 15 Apr 2015 08:12:17 -0500
Subject: [PATCH] Release 2.5.0 / update changelog

---
 CHANGELOG.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45656b4a..3ddeb3ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
-# Unreleased
+# 2.5.0 (April 15, 2015)
 
+* Fix stdlib nil support (Blaž Hrastnik)
+* Support custom Scanner not reading entire value
+* Fix empty array scanning (Laurent Debacker)
+* Add ParseDSN (deoxxa)
+* Add timestamp support to NullTime
+* Remove unused text format scanners
+* Return error when too many parameters on Prepare
+* Add Travis CI integration (Jonathan Rudenberg)
+* Large object support (Blake Gentry)
+* Fix reading null byte arrays (Karl Seguin)
 * Add timestamptz[] support
 * Add timestamp[] support (Karl Seguin)
 * Add bool[] support (Karl Seguin)