Merge branch 'MDL-37527-23' of github.com:damyon/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 21 Jan 2013 02:04:04 +0000 (10:04 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Jan 2013 02:04:04 +0000 (10:04 +0800)

Trivial merge