Merge branch 'MDL-37642-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Mar 2013 17:00:31 +0000 (18:00 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Mar 2013 17:00:31 +0000 (18:00 +0100)

Trivial merge