Merge branch 'MDL-25869' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Jan 2011 08:10:46 +0000 (16:10 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Jan 2011 08:10:46 +0000 (16:10 +0800)
commit03364f9e2f3eb5c0b5336c82adde5b9d1acc8d15
tree86c5ea1e3050ee55a0c5478c9bd36b5698cf5816
parent726bc5250482389360700ce0d7c915a8a601eee1
parent15217303aea3c4c3327dcf65d3aafeb7316ed79a
Merge branch 'MDL-25869' of git://git.luns.net.uk/moodle