Merge branch 'MDL-25953-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 31 Jul 2012 04:01:49 +0000 (12:01 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 31 Jul 2012 04:01:49 +0000 (12:01 +0800)

Trivial merge