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

Trivial merge