Merge branch 'MDL-34937' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Aug 2012 06:19:22 +0000 (14:19 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Aug 2012 06:19:22 +0000 (14:19 +0800)

Trivial merge