Merge branch 'MDL-32745-master-1' of git://git.luns.net.uk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 7 May 2012 02:18:06 +0000 (10:18 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 7 May 2012 02:18:06 +0000 (10:18 +0800)

Trivial merge