Merge branch 'MDL-38061-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Feb 2013 02:16:29 +0000 (10:16 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 25 Feb 2013 02:16:29 +0000 (10:16 +0800)

Trivial merge