Merge branch 'MDL-43127-master-fixup' of https://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 26 Nov 2014 09:22:56 +0000 (09:22 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 26 Nov 2014 09:22:56 +0000 (09:22 +0000)

Trivial merge