Merge branch 'master' into x-updates

2013-08-22 19:29:09 +02:00
parent af0e6b6b2b d28a189af6
commit c1e62e7e91
615 changed files with 24465 additions and 25888 deletions
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
    license = "LGPLv2+";
    homepage = http://www.clutter-project.org/;

-    maintainers = with stdenv.lib.maintainers; [ urkud ludo ];
+    maintainers = with stdenv.lib.maintainers; [ urkud ];
    platforms = stdenv.lib.platforms.mesaPlatforms;
  };
 }