From 9a87c010e5df4710134bbd354c7a8b2182191add Mon Sep 17 00:00:00 2001
From: alisdair sullivan <alisdairsullivan@yahoo.ca>
Date: Wed, 25 Feb 2015 20:40:17 -0800
Subject: [PATCH] v2.5.0

---
 CHANGES.md      | 7 +++++++
 README.md       | 4 ++--
 src/jsx.app.src | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 0de2a3a..066265d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,10 @@
+v2.5.0
+
+* `consult/2` function for reading a file directly to a json term
+* `maps_always` build flag for always returning maps on platforms
+  that support them
+* dialyzer fixes
+
 v2.4.0
 
 * enough performance improvements to justify a new version. 2-3x
diff --git a/README.md b/README.md
index 857043a..7ee6f52 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
-# jsx (v2.4) #
+# jsx (v2.5.0) #
 
 an erlang application for consuming, producing and manipulating [json][json]. 
 inspired by [yajl][yajl]
 
 **jsx** is built via [rebar][rebar] and continuous integration testing provided courtesy [travis-ci][travis]
 
-current status: [![Build Status](https://secure.travis-ci.org/talentdeficit/jsx.png?branch=develop)](http://travis-ci.org/talentdeficit/jsx)
+current status: [![Build Status](https://secure.travis-ci.org/talentdeficit/jsx.png?branch=master)](http://travis-ci.org/talentdeficit/jsx)
 
 **jsx** is released under the terms of the [MIT][MIT] license
 
diff --git a/src/jsx.app.src b/src/jsx.app.src
index f0090de..752fab2 100644
--- a/src/jsx.app.src
+++ b/src/jsx.app.src
@@ -1,7 +1,7 @@
 {application, jsx,
 [
     {description, "a streaming, evented json parsing toolkit"},
-    {vsn, "2.4.0"},
+    {vsn, "2.5.0"},
     {modules, [
         jsx,
         jsx_encoder,