Merge branch 'MDL-20609' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 23 Jul 2013 08:44:32 +0000 (16:44 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 23 Jul 2013 08:44:32 +0000 (16:44 +0800)

Trivial merge