Merge branch 'MDL-17884_m20' of git://github.com/rwijaya/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Jan 2011 08:00:20 +0000 (16:00 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Jan 2011 08:00:20 +0000 (16:00 +0800)
commit9498654c1d6feba14bbac91de2900d3382995173
tree6642786297cdae3dd38324287efcbff2f5a2944d
parentfe1f367a115e90f805ff537132ae912b0fdc3b62
parent2d572444e1a6096a736c7360abcb29bf8966a737
Merge branch 'MDL-17884_m20' of git://github.com/rwijaya/moodle