Merge branch 'MDL-33401-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 5 Jun 2012 04:34:29 +0000 (12:34 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 5 Jun 2012 04:34:29 +0000 (12:34 +0800)

Trivial merge