Merge branch 'MDL-29334_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 17 Dec 2012 05:48:25 +0000 (13:48 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Dec 2012 05:48:25 +0000 (13:48 +0800)

Trivial merge