Merge branch 'MDL-34248_master' of https://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Jul 2014 11:01:04 +0000 (12:01 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Jul 2014 11:01:04 +0000 (12:01 +0100)

Trivial merge