Merge branch 'MDL-38203' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Aug 2013 03:28:39 +0000 (11:28 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Aug 2013 03:28:39 +0000 (11:28 +0800)

Trivial merge