Merged branch 'MDL-25775_head' of git://github.com/grabs/moodle.git
authorSam Hemelryk <sam@moodle.com>
Wed, 8 Jun 2011 05:49:36 +0000 (13:49 +0800)
committerSam Hemelryk <sam@moodle.com>
Wed, 8 Jun 2011 05:49:36 +0000 (13:49 +0800)
commit287d1c0c2cc85de30ace6815ce61bf77334f6652
tree58e136b3ee47694c87a9d0d401f5604fa3516cc9
parent131a9071d6e5f6d622413bcf4d26020ba1d58f20
parenta9e9549911b69587e8c1f32d0887ea9921b64882
Merged branch 'MDL-25775_head' of git://github.com/grabs/moodle.git
lib/resourcelib.php