Merge branch 'MDL-39507' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 13 Aug 2013 01:52:35 +0000 (09:52 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 13 Aug 2013 01:52:35 +0000 (09:52 +0800)

Trivial merge