Merge branch 'MDL-34742-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 21 Aug 2012 03:59:14 +0000 (11:59 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 21 Aug 2012 03:59:14 +0000 (11:59 +0800)

Trivial merge