Merge branch 'MDL-24299' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Jan 2011 05:10:33 +0000 (13:10 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Jan 2011 05:10:33 +0000 (13:10 +0800)
commit1861a2875a7d1502a24d5aea36b6f22dc1d454ba
treeea7cfb88d1553559ddacd463d263f9906095830a
parent34e54bbb623e5f91769a22e61baa8b3ecfb8b7a8
parent936a0ae07e9c13976ef56031cbbc7e539ed75d4a
Merge branch 'MDL-24299' of git://git.luns.net.uk/moodle