Merge branch 'MDL-34707_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 6 Aug 2012 06:42:13 +0000 (14:42 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Aug 2012 06:42:13 +0000 (14:42 +0800)

Trivial merge