Merge 'master' into staging

(relatively simple conflicts)
2015-04-26 22:52:08 +02:00
parent c1cc2348e4 2cb3dc6812
commit 30f31c9afc
508 changed files with 26127 additions and 13733 deletions
@@ -15,6 +15,6 @@ stdenv.mkDerivation {
    homepage = http://www.cityinthesky.co.uk/opensource/pdf2svg;
    license = stdenv.lib.licenses.gpl2;
    maintainers = [ stdenv.lib.maintainers.ianwookim ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
  };
 }