Merge branch 'master' into closure-size

2015-12-11 18:31:00 +01:00
parent 2f0fe05543 146784f835
commit 5b0352a6a4
577 changed files with 28738 additions and 7408 deletions
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
  meta = with stdenv.lib; {
    homepage = http://xiph.org/ogg/;
    license = licenses.bsd3;
-    maintainers = [ maintainers.emery ];
+    maintainers = [ maintainers.ehmry ];
    platforms = platforms.all;
  };
 }