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
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
      app), available for Linux and Windows.
    '';
    homepage = "http://zealdocs.org/";
-    licenses = with stdenv.lib.licenses; [ gpl3 ];
+    license = with stdenv.lib.licenses; [ gpl3 ];
    platforms = stdenv.lib.platforms.linux;
    maintainers = with stdenv.lib.maintainers; [ skeidel ];
  };