Merge branch 'MDL-35257' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Sep 2012 23:53:35 +0000 (01:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Sep 2012 23:53:35 +0000 (01:53 +0200)

Trivial merge