Merge branch 'MDL-33173-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 25 May 2012 01:57:35 +0000 (09:57 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 25 May 2012 01:57:35 +0000 (09:57 +0800)

Trivial merge