Merge branch 'wip-MDL-21097-m23' of git://github.com/marinaglancy/moodle into MOODLE_...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jun 2013 08:45:19 +0000 (10:45 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jun 2013 08:45:19 +0000 (10:45 +0200)
Conflicts:
index.php


Trivial merge