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

Trivial merge