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

Trivial merge