Merge branch 'MDL-37635-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Feb 2013 03:56:45 +0000 (11:56 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Feb 2013 03:56:45 +0000 (11:56 +0800)

Trivial merge