Merge branch 'MDL-25478' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Jan 2011 05:02:52 +0000 (13:02 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Jan 2011 05:02:52 +0000 (13:02 +0800)
commit34e54bbb623e5f91769a22e61baa8b3ecfb8b7a8
tree324590d9e98a3bb15851d08f09ee4167f64ff53a
parent0d2d7a6553a7388c50047ef58b9d351779219e47
parentebb32067bf928b0decaa406ea3f281fa14bf2f4f
Merge branch 'MDL-25478' of git://git.luns.net.uk/moodle