Merge branch 'MDL-14908-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 8 Dec 2014 13:22:16 +0000 (13:22 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 8 Dec 2014 13:22:16 +0000 (13:22 +0000)

Trivial merge