From bbe3b68b70d0077acc522de17db633c8a889beac Mon Sep 17 00:00:00 2001
From: Yako <yako@YakotekiMacBook-Pro.local>
Date: Thu, 5 Mar 2015 13:53:10 +0800
Subject: [PATCH] 1.2.5

---
 pom.xml                                      | 2 +-
 src/main/java/com/alibaba/fastjson/JSON.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 863c1af63..d8c1831d7 100755
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
 	<groupId>com.alibaba</groupId>
 	<artifactId>fastjson</artifactId>
-	<version>1.2.4</version>
+	<version>1.2.5</version>
 
 	<packaging>jar</packaging>
 	<name>fastjson</name>
diff --git a/src/main/java/com/alibaba/fastjson/JSON.java b/src/main/java/com/alibaba/fastjson/JSON.java
index 510184f41..56783c018 100755
--- a/src/main/java/com/alibaba/fastjson/JSON.java
+++ b/src/main/java/com/alibaba/fastjson/JSON.java
@@ -737,5 +737,5 @@ public abstract class JSON implements JSONStreamAware, JSONAware {
         }
     }
 
-    public final static String VERSION = "1.2.4";
+    public final static String VERSION = "1.2.5";
 }