Merge branch 'MDL-42969-master' of git://github.com/mouneyrac/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 Dec 2013 06:23:48 +0000 (14:23 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Dec 2013 06:23:48 +0000 (14:23 +0800)

Trivial merge