Merge branch 'master' into static-controllers

Conflicts:
	npm-shrinkwrap.json
	package.json

NEWS.md

@@ -1,7 +1,14 @@
-1.21.2 -- 2014-mm-dd
+1.21.3 -- 2014-mm-dd
 --------------------
 
 
+1.21.2 -- 2014-12-15
+--------------------
+
+Announcements:
+ - Upgrades windshaft to 0.32.4
+
+
 1.21.1 -- 2014-12-11
 --------------------
 

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "1.21.2",
+  "version": "1.21.3",
   "dependencies": {
     "cartodb-psql": {
       "version": "0.4.0",
@@ -175,7 +175,7 @@
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
     },
     "windshaft": {
-      "version": "0.32.3",
+      "version": "0.32.5",
       "from": "https://github.com/CartoDB/Windshaft/tarball/static-controller",
       "resolved": "https://github.com/CartoDB/Windshaft/tarball/static-controller",
       "dependencies": {
@@ -315,7 +315,8 @@
                         },
                         "ctype": {
                           "version": "0.5.2",
-                          "from": "ctype@0.5.2"
+                          "from": "ctype@0.5.2",
+                          "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"
                         }
                       }
                     },
@@ -2250,7 +2251,8 @@
                 },
                 "ctype": {
                   "version": "0.5.2",
-                  "from": "ctype@0.5.2"
+                  "from": "ctype@0.5.2",
+                  "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"
                 }
               }
             },

package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "1.21.2",
+    "version": "1.21.3",
     "description": "A map tile server for CartoDB",
     "keywords": [
       "cartodb"