Merge branch 'MDL-32230-23' of https://github.com/mackensen/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Sep 2012 23:20:45 +0000 (01:20 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Sep 2012 23:20:45 +0000 (01:20 +0200)

Trivial merge