Merge branch 'MDL-37337-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 Feb 2013 04:00:45 +0000 (12:00 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Feb 2013 04:00:45 +0000 (12:00 +0800)

Trivial merge