Merge branch 'MDL-30498a_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commit8c495ea4ee66d1c43dae1766386d3a3877658ccb
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Dec 2011 22:11:21 +0000 (13 11:11 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Dec 2011 22:11:21 +0000 (13 11:11 +1300)
tree6f79dd9c672cf1d15c88f60b1165e2c8fe608719
parentbb0ece5a0c411828624dd47e810c43a247e57236
parent4d8a37a0db926661bc3c66ac350cbb0123a004bf
Merge branch 'MDL-30498a_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE