Merge branch 'MDL-34328-MOODLE_23_STABLE-2' of git://git.luns.net.uk/moodle into...
authorDan Poltawski <dan@moodle.com>
Tue, 25 Sep 2012 08:37:32 +0000 (16:37 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 25 Sep 2012 08:37:32 +0000 (16:37 +0800)

Trivial merge