Merge branch 'MDL-35404' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 10 Dec 2012 03:36:38 +0000 (11:36 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 10 Dec 2012 03:36:38 +0000 (11:36 +0800)

Trivial merge