Merge branch 'MDL-24394_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commit859624f26c14da6b1ca286c0266ebe9d8759f2de
authorSam Hemelryk <sam@moodle.com>
Tue, 10 Jan 2012 01:30:22 +0000 (10 14:30 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 10 Jan 2012 01:30:22 +0000 (10 14:30 +1300)
treebdc3102e2731c7b59df9789189166afabee18e16
parent10c3c6d49cb0f56b637984fffb0f7e4a122e72a1
parentc4989dc75fec768f905e3646c94bac821419791d
Merge branch 'MDL-24394_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE