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

diff --cc History.md
index 2d17303,0b2e0d5..245f3cd
--- 1/History.md
--- 2/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 ef606ca,f8b7785..427eecc
--- 1/package.json
--- 2/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"