Merge branch 'MDL-43004-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 22 Dec 2014 15:09:53 +0000 (15:09 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 22 Dec 2014 15:09:53 +0000 (15:09 +0000)

Trivial merge