Merge branch 'wip-MDL-34234-m23' of git://github.com/samhemelryk/moodle into MOODLE_2...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Oct 2012 11:10:06 +0000 (13:10 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Oct 2012 11:10:06 +0000 (13:10 +0200)

Trivial merge