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

Trivial merge