Merge branch 'wip-MDL-37224-m23' of git://github.com/samhemelryk/moodle into MOODLE_2...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Feb 2013 23:49:04 +0000 (00:49 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Feb 2013 23:49:04 +0000 (00:49 +0100)

Trivial merge