Merge branch 'MDL-34532' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 31 Jul 2012 02:42:55 +0000 (10:42 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 31 Jul 2012 02:42:55 +0000 (10:42 +0800)

Trivial merge