Merge branch 'MDL-38515-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_S...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 11:58:42 +0000 (12:58 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 11:58:42 +0000 (12:58 +0100)

Trivial merge