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

Trivial merge