Merge branch 'MDL-28134_branch' of git://github.com/nebgor/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 10 May 2012 08:51:12 +0000 (16:51 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 10 May 2012 08:51:12 +0000 (16:51 +0800)

Trivial merge