Merge master into x-updates

2014-02-02 10:05:25 +01:00
parent fcaa782b6a 14a6a059f5
commit 6e2d3b9847
141 changed files with 1653 additions and 601 deletions
@@ -43,5 +43,6 @@ in
    meta = {
      description = "POSIX threads (pthreads) manual pages from LinuxThreads";
      homepage = http://www.gnu.org/software/libc/;
+      maintainers = stdenv.lib.maintainers.mornfall;
    };
  }