merge from dev

2015-12-14 10:43:03 -05:00
parent 1c8f02ce0f
commit 33b01d778c
911 changed files with 34157 additions and 57125 deletions
@@ -1,6 +1,6 @@
 {
  "name": "requirejs",
-  "version": "2.1.19",
+  "version": "2.1.22",
  "ignore": [],
  "homepage": "http://requirejs.org",
  "authors": [