Merge branch 'm23_MDL-35737' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Wed, 12 Dec 2012 00:44:13 +0000 (08:44 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 12 Dec 2012 00:44:13 +0000 (08:44 +0800)

Trivial merge