Merge branch 'MDL-34405_master' of git://github.com/kordan/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 6 Aug 2012 02:06:15 +0000 (10:06 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Aug 2012 02:06:15 +0000 (10:06 +0800)

Trivial merge