From: GoalSmashers <jakub@goalsmashers.com>
Date: Wed, 23 Oct 2013 14:26:41 +0000 (+0200)
Subject: Merge branch 'master' of github-gs:GoalSmashers/clean-css
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=149c1306b3b6dc05de9d9f5cb9c9b45c13570edf;p=clean-css.git

Merge branch 'master' of github-gs:GoalSmashers/clean-css
---

149c1306b3b6dc05de9d9f5cb9c9b45c13570edf
diff --cc History.md
index 2d173036,0b2e0d55..245f3cd4
--- a/History.md
+++ b/History.md
@@@ -1,13 -1,8 +1,13 @@@
  2.0.0 / 2013-xx-xx (UNRELEASED)
  ==================
  
- * Adds simplified and more advanced text escaping / restoring via EscapeStore class.
+ * Adds simplified and more advanced text escaping / restoring via `EscapeStore` class.
  
 +1.1.4 / 2013-10-23
 +==================
 +
 +* Fixed issue [#152](https://github.com/GoalSmashers/clean-css/issues/152) - adds an option to disable rebasing.
 +
  1.1.3 / 2013-10-04
  ==================
  
diff --cc package.json
index ef606cab,f8b77854..427eecc9
--- a/package.json
+++ b/package.json
@@@ -1,8 -1,9 +1,9 @@@
  {
    "name": "clean-css",
 -  "version": "1.1.3",
 +  "version": "1.1.4",
    "author": "Jakub Pawlowicz <jakub@goalsmashers.com> (http://twitter.com/GoalSmashers)",
    "description": "A well-tested CSS minifier",
+   "license": "MIT",
    "keywords": [
      "css",
      "minifier"