Merge branch 'MDL-36629-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 07:26:18 +0000 (15:26 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 07:26:18 +0000 (15:26 +0800)

Trivial merge