Merge branch 'wip-MDL-35678-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 07:15:43 +0000 (15:15 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 07:15:43 +0000 (15:15 +0800)

Trivial merge