Merge branch 'MDL-39945' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 4 Jun 2013 07:53:56 +0000 (15:53 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 4 Jun 2013 07:53:56 +0000 (15:53 +0800)

Trivial merge