Merge branch 'MDL-34275-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 May 2013 17:14:19 +0000 (19:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 May 2013 17:14:19 +0000 (19:14 +0200)

Trivial merge