Merge branch 'MDL-42285-master' of git://github.com/phalacee/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 28 Oct 2013 06:15:27 +0000 (14:15 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 28 Oct 2013 06:15:27 +0000 (14:15 +0800)

Trivial merge