Merge branch 'MDL-39980' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 22 Aug 2013 02:04:55 +0000 (10:04 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 22 Aug 2013 02:04:55 +0000 (10:04 +0800)

Trivial merge