Merge branch 'MDL-47945-master' of git://github.com/jethac/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 29 Oct 2014 12:56:03 +0000 (12:56 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 29 Oct 2014 12:56:03 +0000 (12:56 +0000)

Trivial merge