Merge branch 'origin/master' into stdenv-updates.

There was a minor conflict in 'stumpwm'. The package needs texinfo version 4.x. At least is used to, I'm not sure whether it still does.
2013-10-18 18:57:24 +02:00
parent ea6f711e8e 06d6c3ed5d
commit 6be8ad3392
1177 changed files with 57151 additions and 6093 deletions
@@ -48,7 +48,7 @@ mkDerivation rec {

  meta = {
    homepage = http://amule.org/;
-    description = "aMule, a peer-to-peer client for the eD2K and Kademlia networks";
+    description = "Peer-to-peer client for the eD2K and Kademlia networks";

    longDescription = ''
      aMule is an eMule-like client for the eD2k and Kademlia