Merge branch 'MDL-36104_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Jan 2013 00:20:06 +0000 (01:20 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Jan 2013 00:20:06 +0000 (01:20 +0100)

Trivial merge