Merge branch 'MDL-38115-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 26 Feb 2013 05:36:24 +0000 (13:36 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 26 Feb 2013 05:36:24 +0000 (13:36 +0800)

Trivial merge