Merge branch 'MDL-37422' of git://github.com/colchambers/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Feb 2013 08:02:57 +0000 (16:02 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Feb 2013 08:02:57 +0000 (16:02 +0800)

Trivial merge