Merge branch 'MDL-31393' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 28 May 2012 07:23:01 +0000 (15:23 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 28 May 2012 07:23:01 +0000 (15:23 +0800)

Trivial merge