Merge branch 'MDL-26120_23' of https://github.com/jacks92/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 May 2013 22:55:42 +0000 (00:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 May 2013 22:55:42 +0000 (00:55 +0200)

Trivial merge