Merge branch 'master.upstream' into staging.upstream

2015-07-01 13:38:17 -07:00
parent 05aa0c0990 87836a2a21
commit 7eae48871f
83 changed files with 894 additions and 219 deletions
@@ -17,7 +17,5 @@ stdenv.mkDerivation rec {
    license = stdenv.lib.licenses.gpl2;

    platforms = stdenv.lib.platforms.linux;
-
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
  };
 }