Merge branch 'MDL-29197' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 1 Nov 2011 03:11:58 +0000 (16:11 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 1 Nov 2011 03:11:58 +0000 (16:11 +1300)
commitbc454be746af8e7cb5b1ad066870646e648837ad
treea4e13a85eb155e5a00fbe1fafda2e2cd0c863285
parentc189b664aed0ecfed2660de01707479993124b09
parentab9d5899b847aae1c194812b91dab0a731283dec
Merge branch 'MDL-29197' of git://github.com/lazydaisy/moodle