Merge branch 'MDL-25639' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Feb 2011 06:21:24 +0000 (14:21 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Feb 2011 06:21:24 +0000 (14:21 +0800)
commit449adacbc3b0ebc99e62c5ad7d70168f787f02e4
treec75b777baad5ea6854c49c89163b523f93da9cb5
parent1ca95a13f3ea4ea1cfcc73caf5202ff3b05b8a2c
parent6110e008cbdc9400d2feb4627df0ee3efa562f3f
Merge branch 'MDL-25639' of git://git.luns.net.uk/moodle