Merge branch 'MDL-34204' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 19 Nov 2012 02:33:25 +0000 (10:33 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 19 Nov 2012 02:33:25 +0000 (10:33 +0800)

Trivial merge