From e15eaf9e8ec383fe0b3751fb4a4d80dc867d2c36 Mon Sep 17 00:00:00 2001
From: shepherdwind <eward.song@gmail.com>
Date: Wed, 16 Sep 2015 07:08:09 +0800
Subject: [PATCH] chore: bump up 0.7.1

---
 History.md   | 8 ++++++++
 package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/History.md b/History.md
index 5fe1ffc..6e1267a 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,11 @@
+## 0.7.1
+
+- fix: merge [51](https://github.com/shepherdwind/velocity.js/pull/51)
+
+## 0.7.0
+
+- feat: merge [49](https://github.com/shepherdwind/velocity.js/pull/49) and [#50](https://github.com/shepherdwind/velocity.js/pull/50)
+
 ## 0.6.2
 
 - feat: merge [47](https://github.com/shepherdwind/velocity.js/pull/47)
diff --git a/package.json b/package.json
index 23d6e58..e47adf4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "velocityjs",
   "description": "Velocity Template Language(VTL) for JavaScript",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "keywords": [
     "velocity template"
   ],