Merge branch 'MDL-26611-take2' of git://git.luns.net.uk/moodle
commit8323432992de4e0c20f32b86b1412deec07adaaa
authorSam Hemelryk <sam@moodle.com>
Wed, 6 Jul 2011 03:06:20 +0000 (6 11:06 +0800)
committerSam Hemelryk <sam@moodle.com>
Wed, 6 Jul 2011 03:06:20 +0000 (6 11:06 +0800)
tree3abd002e931696d640de4babb7de291918825c5b
parent5b966cbb3ba1fbdeeeab00d2c0fb2204bd55c7aa
parentf2ad1655389622a0031bd9162b346aeb70011d95
Merge branch 'MDL-26611-take2' of git://git.luns.net.uk/moodle