Merge branch 'MDL-26272' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Feb 2011 08:03:27 +0000 (16:03 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Feb 2011 08:03:27 +0000 (16:03 +0800)
commitdedda4abc3135590dda81225fa32ce408a3838e2
tree616447f3df2346ca3d0d114b08dc1f2839f65098
parentc1a974983a06310f257b66ed99ad202cb24a7f81
parent195a0848ec32bee0d19e7937f6e53a566bdeb0bd
Merge branch 'MDL-26272' of git://github.com/stronk7/moodle