Merge branch 'w18_MDL-39374_m26_folderlog' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 May 2013 09:58:09 +0000 (17:58 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 20 May 2013 09:58:09 +0000 (17:58 +0800)

Trivial merge