Merge branch 'MDL-37395-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Jan 2013 17:17:33 +0000 (18:17 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Jan 2013 17:17:33 +0000 (18:17 +0100)

Trivial merge