Merge branch 'MDL-34483' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 31 Jul 2012 01:11:48 +0000 (09:11 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 31 Jul 2012 01:11:48 +0000 (09:11 +0800)

Trivial merge