Merge branch 'MDL-34054' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 Jul 2012 06:56:50 +0000 (14:56 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Jul 2012 06:56:50 +0000 (14:56 +0800)

Trivial merge