Merge branch 'MDL-36023-master' of git://git.luns.net.uk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 6 Nov 2012 01:35:31 +0000 (09:35 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Nov 2012 01:35:31 +0000 (09:35 +0800)

Trivial merge