Merge branch 'MDL-25709-2' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Jan 2011 04:08:10 +0000 (12:08 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Jan 2011 04:08:10 +0000 (12:08 +0800)
commit0d2d7a6553a7388c50047ef58b9d351779219e47
tree6c4acdb9e589afc0a1820b5f6eef052091d1a24f
parent46f4c3932f033ec7d29a3f6ae54a568ea1cacb6b
parent047c3b6cd31a89eb9dc4fd25c696626eed969e15
Merge branch 'MDL-25709-2' of git://git.luns.net.uk/moodle