Merge branch 'MDL-36616-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 03:48:11 +0000 (11:48 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 03:48:11 +0000 (11:48 +0800)

Trivial merge