Merge branch 'master_MDL-34994' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 16:17:55 +0000 (18:17 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 16:17:55 +0000 (18:17 +0200)

Trivial merge