Merge branch 'MDL-36845_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 11 Dec 2012 03:58:54 +0000 (11:58 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 11 Dec 2012 03:58:54 +0000 (11:58 +0800)

Trivial merge