Merge branch 'MDL-27156_part2' of git://github.com/andyjdavis/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 20 Jun 2012 08:38:13 +0000 (16:38 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 20 Jun 2012 08:38:13 +0000 (16:38 +0800)

Trivial merge