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

Conflicts:
	lib/less/render.js

Author: lukeapage

lib/less/parse.js

@@ -46,6 +46,10 @@ module.exports = function(environment, ParseTree, ImportManager) {
                     entryPath: entryPath,
                     rootFilename: filename
                 };
+                // add in a missing trailing slash
+                if (rootFileInfo.rootpath && rootFileInfo.rootpath.slice(-1) !== "/") {
+                    rootFileInfo.rootpath += "/";
+                }
             }
 
             var imports = new ImportManager(context, rootFileInfo);