Merge branch 'master_MDL-33078' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Feb 2013 22:58:41 +0000 (23:58 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Feb 2013 22:58:41 +0000 (23:58 +0100)

Trivial merge