Merge branch 'MDL-36099-master' of git://git.luns.net.uk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 29 Oct 2012 06:50:23 +0000 (14:50 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 29 Oct 2012 06:50:23 +0000 (14:50 +0800)

Trivial merge