Merge branch 'MDL-47944-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 4 Nov 2014 16:30:17 +0000 (16:30 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 4 Nov 2014 16:30:17 +0000 (16:30 +0000)

Trivial merge