Merge branch 'MDL-31065_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commitb19a440a04f103697d53ac03590cdca185d1e45e
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Jan 2012 23:07:06 +0000 (24 00:07 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Jan 2012 23:07:06 +0000 (24 00:07 +0100)
tree81a5ff81395480c83eb1ca8050d9111010a4e6b9
parent787c2eefd3e13f75d2282c055fcf528d49e6eec4
parent4eac963a413d82637ab2dbc8e8cad95e7ac1ade4
Merge branch 'MDL-31065_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE