Merge branch 'master.upstream' into staging.upstream

2015-06-06 12:04:42 -07:00
parent 40b66f6131 ee8825935f
commit 9d6555dc0a
282 changed files with 10933 additions and 4164 deletions
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
    description = "A tiling window manager for X11";
    homepage    = https://github.com/stumpwm/;
    license     = licenses.gpl2Plus;
-    maintainers = with maintainers; [ _1126 the-kenny ];
+    maintainers = with maintainers; [ hiberno the-kenny ];
    platforms   = platforms.linux;
  };
 }