Merge branch 'MDL-42507-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 Oct 2013 06:48:27 +0000 (14:48 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Oct 2013 06:48:27 +0000 (14:48 +0800)

Trivial merge