Merge branch 'MDL-27655' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 12 Aug 2013 08:41:29 +0000 (16:41 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 12 Aug 2013 08:41:29 +0000 (16:41 +0800)

Trivial merge