Merge branch 'MDL-36138-master' of git://github.com/StudiUM/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Jan 2013 05:40:02 +0000 (13:40 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Jan 2013 05:40:02 +0000 (13:40 +0800)

Trivial merge