Merge branch 'master' into closure-size

2016-02-14 08:33:51 +01:00
parent 34922a3951 6a036d9fca
commit d039c87984
671 changed files with 37363 additions and 16671 deletions
@@ -27,6 +27,6 @@ in
      description = "A repository of data files describing media player capabilities";
      homepage = "http://www.freedesktop.org/wiki/Software/media-player-info/";
      license = licenses.bsd3;
-      maintainer = with maintainers; [ ttuegel ];
+      maintainers = with maintainers; [ ttuegel ];
    };
  }