Merge branch 'MDL-33035-m23' of git://github.com/sunner/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 14 Jun 2012 04:29:14 +0000 (12:29 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 14 Jun 2012 04:29:14 +0000 (12:29 +0800)

Trivial merge