Merge branch 'wip_MDL-40949_m28_pathsettings' of https://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 29 Oct 2014 13:04:46 +0000 (13:04 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 29 Oct 2014 13:04:46 +0000 (13:04 +0000)

Trivial merge