Merge branch 'MDLmaster-MDL-37157-2' of https://github.com/OdyX/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 7 Jan 2013 05:59:52 +0000 (13:59 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 7 Jan 2013 05:59:52 +0000 (13:59 +0800)

Trivial merge