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

Trivial merge