Merge branch 'MDL-47390-master-fixes' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 6 Nov 2014 09:14:48 +0000 (09:14 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 6 Nov 2014 09:14:48 +0000 (09:14 +0000)

Trivial merge