Merge branch 'MDL-36399' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 29 Jul 2013 04:40:05 +0000 (12:40 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 29 Jul 2013 04:40:05 +0000 (12:40 +0800)

Trivial merge