Merge branch 'MDL-35767-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE...
authorDan Poltawski <dan@moodle.com>
Thu, 4 Oct 2012 08:57:57 +0000 (16:57 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 4 Oct 2012 08:57:57 +0000 (16:57 +0800)

Trivial merge