Merge branch 'MDL-36784-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 05:06:32 +0000 (13:06 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 05:06:32 +0000 (13:06 +0800)

Trivial merge