Merge master into staging

2015-10-23 01:57:14 +02:00
parent cf787f0282 c76f010450
commit 4917a4f8b3
247 changed files with 16829 additions and 1271 deletions
@@ -129,7 +129,7 @@ let
          inherit majorVersion minorVersion teenyVersion patchLevel;
          rubyEngine = "ruby";
          baseRuby = baseruby;
-          libPath = "lib/${versionNoPatch}";
+          libPath = "lib/${rubyEngine}/${versionNoPatch}";
          gemPath = "lib/${rubyEngine}/gems/${versionNoPatch}";
        };
      }