Merge branch 'MDL-33116-master' of git://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 May 2012 04:51:45 +0000 (12:51 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 22 May 2012 04:51:45 +0000 (12:51 +0800)

Trivial merge