Merge branch 'MDL-39166-m23' of https://github.com/jfilip/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Jun 2013 21:55:54 +0000 (23:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Jun 2013 21:55:54 +0000 (23:55 +0200)

Trivial merge