Merge branch 'MDL-36482_23' of https://github.com/mr-russ/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 May 2013 00:28:34 +0000 (02:28 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 May 2013 00:28:34 +0000 (02:28 +0200)

Trivial merge