From 48befaf00dc17de2e69089a63f3401922806fb0f Mon Sep 17 00:00:00 2001
From: zhouhaibin <283595276@qq.com>
Date: Fri, 10 Aug 2012 15:08:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'zhb/master'

Conflicts:
	src/main/java/com/alibaba/druid/support/http/StatViewServlet.java
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 696465cc14..e8cfe02253 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>com.alibaba</groupId>
 	<artifactId>druid</artifactId>
-	<version>0.2.7-SNAPSHOT</version>
+	<version>0.2.6-SNAPSHOT</version>
 
 	<packaging>jar</packaging>
 	<name>druid</name>