Merge branch 'MDL-48068-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 5 Nov 2014 12:03:48 +0000 (12:03 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 5 Nov 2014 12:03:48 +0000 (12:03 +0000)

Trivial merge