Merge branch 'MDL-25729_m20' of git://github.com/rwijaya/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Jan 2011 07:54:27 +0000 (15:54 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Jan 2011 07:54:27 +0000 (15:54 +0800)
commitfe1f367a115e90f805ff537132ae912b0fdc3b62
tree84ade85b17f1771cddd498f8a0245fde5df1cd2a
parentca08b132e37477c7901aacff2c11cdef02324e33
parent5419885ff850a59710dfc2f52ffb881816fc5863
Merge branch 'MDL-25729_m20' of git://github.com/rwijaya/moodle