Merge branch 'mdl34020-master' of https://github.com/tlock/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 21 Jan 2014 07:21:17 +0000 (15:21 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 21 Jan 2014 07:21:17 +0000 (15:21 +0800)

Trivial merge