Merge branch 'MDL-34733' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 22 Aug 2012 01:16:10 +0000 (09:16 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 22 Aug 2012 01:16:10 +0000 (09:16 +0800)

Trivial merge