From d98df17dd764405b9955d4770c50a37d267239b0 Mon Sep 17 00:00:00 2001
From: alisdair sullivan <alisdairsullivan@yahoo.ca>
Date: Mon, 20 Apr 2015 19:56:13 -0700
Subject: [PATCH] v2.6.0

---
 CHANGES.md      | 4 ++++
 README.md       | 2 +-
 mix.exs         | 4 ++--
 src/jsx.app.src | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 966f4eb..8b32304 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,7 @@
+v2.6.0
+
+* equivalent to v2.5.3 but created for semver reasons
+
 v2.5.3
 
 * add a `mix.exs` to be buildable by both mix and rebar
diff --git a/README.md b/README.md
index 4827e73..343ca70 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# jsx (v2.5.3) #
+# jsx (v2.6.0) #
 
 
 an erlang application for consuming, producing and manipulating [json][json]. 
diff --git a/mix.exs b/mix.exs
index d8aab4c..c1ab1d7 100644
--- a/mix.exs
+++ b/mix.exs
@@ -4,7 +4,7 @@ use Mix.Project
   def project do
     [
       app: :jsx,
-      version: "2.5.3",
+      version: "2.6.0",
       description: "an erlang application for consuming, producing and manipulating json. inspired by yajl",
       deps: deps(Mix.env),
       package: package,
@@ -16,7 +16,7 @@ use Mix.Project
   defp opts(:dev), do: [d: :TEST]
   defp opts(_), do: []
 
-  defp deps(:dev), do: [{:mixunit, "~> 0.9.1", :optional}]
+  defp deps(:dev), do: [{:mixunit, "~> 0.9.1", [optional: true]}]
   defp deps(_), do: []
 
   defp package do
diff --git a/src/jsx.app.src b/src/jsx.app.src
index 50f00b5..ff7b2fd 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.5.3"},
+    {vsn, "2.6.0"},
     {modules, [
         jsx,
         jsx_encoder,