Merge branch 'MDL-30986-attempt2' of git://github.com/mouneyrac/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 1 May 2012 02:59:06 +0000 (10:59 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 1 May 2012 02:59:06 +0000 (10:59 +0800)

Trivial merge