Merge branch 'MDL-33756' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 15 Jun 2012 10:38:35 +0000 (18:38 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 15 Jun 2012 10:38:35 +0000 (18:38 +0800)

Trivial merge