Merge branch 'MDL-48067-master' of git://github.com/jethac/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 5 Nov 2014 10:15:41 +0000 (10:15 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 5 Nov 2014 10:15:41 +0000 (10:15 +0000)

Trivial merge