Merge branch 'MDL-28618' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 8 Aug 2011 02:57:11 +0000 (10:57 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 8 Aug 2011 02:57:11 +0000 (10:57 +0800)
commit2f86bcfffa03f68dccef26a07fde5de2779f92af
treef1008a71ba9c0309ec018626b19f619c716ae1ca
parentb1251c9008d422878e53174c9fcac002e1690dd6
parenta23bda41e44c43f1af1f76e024407463e011e217
Merge branch 'MDL-28618' of git://github.com/timhunt/moodle