Merge branch 'MDL-33206-master' of git://github.com/StudiUM/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Jan 2013 04:58:27 +0000 (12:58 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Jan 2013 04:58:27 +0000 (12:58 +0800)

Trivial merge