Merge branch 'w07_MDL-38059_m25_cachedir' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 19 Feb 2013 06:07:13 +0000 (14:07 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 19 Feb 2013 06:07:13 +0000 (14:07 +0800)

Trivial merge