Merge branch 'wip-mdl-42491-master' of git://github.com/deraadt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 28 Oct 2013 03:21:26 +0000 (11:21 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 28 Oct 2013 03:21:26 +0000 (11:21 +0800)

Trivial merge