Merge branch 'MDL-36618-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 3 Dec 2012 02:36:16 +0000 (10:36 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 3 Dec 2012 02:36:16 +0000 (10:36 +0800)

Trivial merge