Merge branch 'MDL-36914-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 3 Dec 2012 06:45:04 +0000 (14:45 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 3 Dec 2012 06:45:04 +0000 (14:45 +0800)

Trivial merge