Merge branch 'MDL-34250_23' of github.com:stronk7/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Aug 2012 18:44:49 +0000 (20:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Aug 2012 18:44:49 +0000 (20:44 +0200)

Trivial merge