Merge branch 'master' of https://github.com/less/less.js

lib/less/import-visitor.js

@@ -133,7 +133,7 @@
             this.env.frames.shift();
         },
         visitMedia: function (mediaNode, visitArgs) {
-            this.env.frames.unshift(mediaNode.ruleset);
+            this.env.frames.unshift(mediaNode.rules[0]);
             return mediaNode;
         },
         visitMediaOut: function (mediaNode) {
@@ -141,4 +141,4 @@
         }
     };
 
-})(require('./tree'));
+})(require('./tree'));

package.json

@@ -42,7 +42,7 @@
   "optionalDependencies": {
     "graceful-fs": "~2.0.3",
     "mime": "~1.2.11",
-    "request": "~2.34.0",
+    "request": "~2.40.0",
     "mkdirp": "~0.3.5",
     "clean-css": "2.1.x",
     "source-map": "0.1.x"

test/css/import.css

@@ -35,3 +35,8 @@
     color: yellow;
   }
 }
+@media print {
+  body {
+    width: 100%;
+  }
+}

test/less/import.less

@@ -19,4 +19,8 @@
 
 @import (multiple) "import/import-test-e" screen and (max-width: 602px);
 
-@import (less, multiple) url("import/import-test-d.css") screen and (max-width: 603px);
+@import (less, multiple) url("import/import-test-d.css") screen and (max-width: 603px);
+
+@media print {
+  @import (multiple) "import/import-test-e";
+}