Merge branch 'MDL-34466_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 30 Jul 2012 07:02:01 +0000 (15:02 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 30 Jul 2012 07:02:01 +0000 (15:02 +0800)

Trivial merge