Merge branch 'MDL-31135_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commit8a9edd6dba26ac60973a93b1082d91ce7bab398f
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Jan 2012 08:41:24 +0000 (16 16:41 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Jan 2012 08:41:24 +0000 (16 16:41 +0800)
tree1820bb89225985f2055bc4eeec4a939779e4a724
parent282dcd3c0329a77154bdbd28ea6b3d84d4dc5f0b
parenta8f912faf1caec9497c4e3ac3b2cf58b23b8398e
Merge branch 'MDL-31135_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE