Merge branch 'MDL-30677' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Dec 2011 22:20:22 +0000 (11:20 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Dec 2011 22:20:22 +0000 (11:20 +1300)
commit746e7c4a5e8701440c90e9eae428a40af734373c
treed44044b69a29b2df073aa5d27913eae1aca434ad
parent6508fbc37d19bf5017d720f760aa4ed5bbcf757d
parent3f11d7f92346304d888c1d29b5e4f0265b2060b0
Merge branch 'MDL-30677' of git://github.com/timhunt/moodle