Merge branch 'MDL-32177' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 26 Mar 2012 01:26:21 +0000 (09:26 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 26 Mar 2012 01:26:21 +0000 (09:26 +0800)

Trivial merge