Merge branch 'MDL-47874' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 5 Nov 2014 14:27:12 +0000 (14:27 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 5 Nov 2014 14:27:12 +0000 (14:27 +0000)

Trivial merge