Merge branch 'MDL-34728' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Aug 2012 05:28:49 +0000 (13:28 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Aug 2012 05:28:49 +0000 (13:28 +0800)

Trivial merge