Merge master into x-updates (the binutils change)

2014-01-28 18:00:29 +01:00
parent 120be16479 6f5be260b4
commit 908ce109f9
44 changed files with 291 additions and 95 deletions
--- a/pkgs/servers/dict/default.nix
+++ b/pkgs/servers/dict/default.nix
@@ -14,5 +14,6 @@ stdenv.mkDerivation {

  meta = {
    description = "Dict protocol server and client";
+    maintainers = with stdenv.lib.maintainers; mornfall;
  };
 }