Merge branch 'MDL-32581' of git://github.com/mouneyrac/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 5 Jun 2012 07:23:28 +0000 (15:23 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 5 Jun 2012 07:23:28 +0000 (15:23 +0800)

Trivial merge