Merge branch 'w11_MDL-26697_20_media' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Mar 2011 14:21:02 +0000 (15:21 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Mar 2011 14:21:02 +0000 (15:21 +0100)
commite5e64a4886b9babe30bbd2c33cacb56a57b62401
tree3cb644052b9931fb4cf968c7d96566816a5c5c22
parentb0b4ab1aff3224c27d9b23438b45b9821beff98a
parentfcd2cbaf1f99750ce1a44780ae1dad24f21078b7
Merge branch 'w11_MDL-26697_20_media' of git://github.com/skodak/moodle

Conflicts:
theme/formal_white/config.php
lib/outputrenderers.php
lib/outputrequirementslib.php
lib/weblib.php
theme/formal_white/config.php