Merge branch 'MDL-32321_master' of git://github.com/kordan/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 15 May 2012 07:30:28 +0000 (15:30 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 May 2012 07:30:28 +0000 (15:30 +0800)

Trivial merge