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
@@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
    description = "FUSE UnionFS implementation";
    homepage = http://podgorny.cz/moin/UnionFsFuse;
    license = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
    platforms = stdenv.lib.platforms.linux;
  };
 }