Merge branch 'MDL-27768' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 25 Jul 2011 01:39:31 +0000 (09:39 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 25 Jul 2011 01:39:31 +0000 (09:39 +0800)
commit310758d65534dc168dec1a427ec29f05d11d68ed
treedace9b5c4bc38d9bf79eeb146aa5b74678b0d075
parent6884b598f3652dd2b02f5d1e5980bfe6651dcba9
parent080fbe680d31b63c3bb1c3afd3a23b33211e116b
Merge branch 'MDL-27768' of git://github.com/lazydaisy/moodle