Merge branch 'MDL-40863' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 29 Jul 2013 02:09:45 +0000 (10:09 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 29 Jul 2013 02:09:45 +0000 (10:09 +0800)

Trivial merge