Merge branch 'wip-MDL-35847-master' of git://github.com/phalacee/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 5 Feb 2013 01:29:25 +0000 (09:29 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 5 Feb 2013 01:29:25 +0000 (09:29 +0800)

Trivial merge