Merge branch 'MDL-36022-master' of git://git.luns.net.uk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 08:04:08 +0000 (16:04 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 08:04:08 +0000 (16:04 +0800)

Trivial merge