Merge branch 'master_MDL-37844' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Apr 2013 23:14:06 +0000 (01:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Apr 2013 23:14:06 +0000 (01:14 +0200)

Trivial merge