Merge branch 'MDL-37770-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Feb 2013 06:32:01 +0000 (14:32 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 25 Feb 2013 06:32:01 +0000 (14:32 +0800)

Trivial merge