Merge branch 'MDL-33476' of git://github.com/esqueeze/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 5 Jun 2012 04:15:47 +0000 (12:15 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 5 Jun 2012 04:15:47 +0000 (12:15 +0800)

Trivial merge