From 2ec6b383bc9fd3aa7fed6782ca401848e8338b78 Mon Sep 17 00:00:00 2001
From: Paul Armstrong <paul@paularmstrongdesigns.com>
Date: Fri, 6 Sep 2013 14:34:25 -0700
Subject: [PATCH] version bump 1.0.0-rc2

---
 HISTORY.md          | 11 +++++++++++
 browser/comments.js |  2 +-
 docs/docs.json      |  2 +-
 docs/index.json     |  2 +-
 lib/swig.js         |  4 ++--
 package.json        |  2 +-
 tests/basic.test.js |  4 ++--
 7 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 86939ec4..6ef6afd9 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,14 @@
+[1.0.0-rc2](https://github.com/paularmstrong/swig/tree/v1.0.0-rc2) / 2013-09-06
+-------------------------------------------------------------------------------
+
+* **Changed** Function output from `variable` blocks are no longer auto-escaped. gh-309
+* **Fixed** Allow nested macros to work when importing. gh-310
+* **Fixed** swig.setDefaultTZOffset. gh-311
+* **Changed** `set` tag assigns to the local context, allowing setting within `for` loops, etc. gh-303
+* **Fixed** Standardize variable undefined checking. gh-301
+* **Fixed** Remove multiple redefinition of block-level tags in compiled templates.
+* **Fixed** Performance issue with compile if no default locals are defined.
+
 [1.0.0-rc1](https://github.com/paularmstrong/swig/tree/v1.0.0-rc1) / 2013-08-28
 -------------------------------------------------------------------------------
 
diff --git a/browser/comments.js b/browser/comments.js
index 55f3829f..d2974369 100644
--- a/browser/comments.js
+++ b/browser/comments.js
@@ -1,2 +1,2 @@
-/*! Swig v1.0.0-rc1 | https://paularmstrong.github.com/swig | @license https://github.com/paularmstrong/swig/blob/master/LICENSE */
+/*! Swig v1.0.0-rc2 | https://paularmstrong.github.com/swig | @license https://github.com/paularmstrong/swig/blob/master/LICENSE */
 /*! DateZ (c) 2011 Tomo Universalis | @license https://github.com/TomoUniversalis/DateZ/blob/master/LISENCE */
diff --git a/docs/docs.json b/docs/docs.json
index 1a386ac9..4ca17997 100644
--- a/docs/docs.json
+++ b/docs/docs.json
@@ -1,3 +1,3 @@
 {
-  "version": "v1.0.0-rc1"
+  "version": "v1.0.0-rc2"
 }
diff --git a/docs/index.json b/docs/index.json
index 1a386ac9..4ca17997 100644
--- a/docs/index.json
+++ b/docs/index.json
@@ -1,3 +1,3 @@
 {
-  "version": "v1.0.0-rc1"
+  "version": "v1.0.0-rc2"
 }
diff --git a/lib/swig.js b/lib/swig.js
index c47b6597..ace48aa1 100644
--- a/lib/swig.js
+++ b/lib/swig.js
@@ -9,11 +9,11 @@ var fs = require('fs'),
 /**
  * Swig version number as a string.
  * @example
- * if (swig.version === "1.0.0-rc1") { ... }
+ * if (swig.version === "1.0.0-rc2") { ... }
  *
  * @type {String}
  */
-exports.version = "1.0.0-rc1";
+exports.version = "1.0.0-rc2";
 
 /**
  * Swig Options Object. This object can be passed to many of the API-level Swig methods to control various aspects of the engine. All keys are optional.
diff --git a/package.json b/package.json
index 8b81cadf..7cd6c8c2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "swig",
-  "version": "1.0.0-rc1",
+  "version": "1.0.0-rc2",
   "description": "A simple, powerful, and extendable templating engine for node.js and browsers, similar to Django, Jinja2, and Twig.",
   "keywords": [
     "template",
diff --git a/tests/basic.test.js b/tests/basic.test.js
index c257a0af..d03192a5 100644
--- a/tests/basic.test.js
+++ b/tests/basic.test.js
@@ -13,8 +13,8 @@ function resetOptions() {
 }
 
 describe('version', function () {
-  it('is 1.0.0-rc1', function () {
-    expect(swig.version).to.equal('1.0.0-rc1');
+  it('is 1.0.0-rc2', function () {
+    expect(swig.version).to.equal('1.0.0-rc2');
   });
 });