Merge branch 'w51_MDL-30621_m23_protectdir' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Dec 2011 21:17:45 +0000 (10:17 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Dec 2011 21:17:45 +0000 (10:17 +1300)
commit2b9131991f6df3b6e34d7532b34951e8b4d96c1b
tree017c7f02e1f62e86b0fe26ffff191778e94674ec
parentc45c1e1f207c88403433c50d7c9a084bcdf57b62
parent7a7edd21f2049b103784ce5deb6facb82c79aed4
Merge branch 'w51_MDL-30621_m23_protectdir' of git://github.com/skodak/moodle