Merge branch 'MDL-36634-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 08:09:49 +0000 (16:09 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 08:09:49 +0000 (16:09 +0800)

Trivial merge