Merge branch 'less.js/1.5.0-wip'

Conflicts:
	.jshintrc
	Makefile
	package.json

test/css/comments.css

@@ -32,7 +32,6 @@
   color: red;
   /* A C-style comment */
   /* A C-style comment */
-
   background-color: orange;
   font-size: 12px;
   /* lost comment */
@@ -59,7 +58,12 @@
 #last {
   color: #0000ff;
 }
-/*  *//* { *//*  *//*  *//*  */#div {
+/*  */
+/* { */
+/*  */
+/*  */
+/*  */
+#div {
   color: #A33;
 }
 /* } */

test/css/compression/compression.css

@@ -1,5 +1,4 @@
 #colours{color1:#fea;color2:#fea;color3:rgba(255,238,170,0.1);string:"#ffeeaa";/*! but not this type
       Note preserved whitespace
-  */
-}
+  */}
 dimensions{val:.1px;val:0;val:4cm;val:.2;val:5;angles-must-have-unit:0deg;width:auto\9}

test/css/css-guards.css

@@ -10,3 +10,9 @@
 .multiple-conditions-1 {
   color: red;
 }
+.inheritance .test {
+  color: black;
+}
+.inheritance:hover {
+  color: pink;
+}

test/css/extend-selector.css

@@ -52,9 +52,9 @@ div.ext7,
 .c.replace + .replace .replace,
 .replace.replace .c,
 .c.replace + .replace .c,
-.rep_ace .rep_ace .rep_ace,
+.rep_ace.rep_ace .rep_ace,
 .c.rep_ace + .rep_ace .rep_ace,
-.rep_ace .rep_ace .c,
+.rep_ace.rep_ace .c,
 .c.rep_ace + .rep_ace .c {
   prop: copy-paste-replace;
 }

test/css/import-inline.css

@@ -1,3 +1,5 @@
-this isn't very valid CSS. @media (min-width: 600px) {
+this isn't very valid CSS.
+@media (min-width: 600px) {
   #css { color: yellow; }
+
 }

test/css/import.css

@@ -1,7 +1,5 @@
 @import url(http://fonts.googleapis.com/css?family=Open+Sans);
-
 @import url(/absolute/something.css) screen and (color) and (max-width: 600px);
-
 @import url("//ha.com/file.css") (min-width: 100px);
 #import-test {
   height: 10px;

test/css/media.css

@@ -118,7 +118,8 @@
     margin: 1cm;
   }
   @page :first {
-    size: 8.5in 11in;@top-left {
+    size: 8.5in 11in;
+    @top-left {
       margin: 1cm;
     }
     @top-left-corner {

test/css/static-urls/urls.css

@@ -1,5 +1,4 @@
 @import "folder (1)/../css/background.css";
-
 @import "folder (1)/import-test-d.css";
 @font-face {
   src: url("/fonts/garamond-pro.ttf");

test/css/urls.css

@@ -1,7 +1,5 @@
 @import "import/../css/background.css";
-
 @import "import/import-test-d.css";
-
 @import "file.css";
 @font-face {
   src: url("/fonts/garamond-pro.ttf");