Merge branch 'MDL-36752-master-2' of git://git.luns.net.uk/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 28 Nov 2012 01:40:24 +0000 (09:40 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 28 Nov 2012 01:40:24 +0000 (09:40 +0800)

Trivial merge