Merge branch 'MDL-35794_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Jan 2013 21:38:48 +0000 (22:38 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Jan 2013 21:38:48 +0000 (22:38 +0100)
commit5050a19ff7c36b1fc79b06a315b6f82a830e451e
tree7028b5eab4ded1efb0cbfbd4be643883c5ecaee7
parent0858993db8ea434a545c69c0d0173fd73506795e
parente349d184358000bcb137516fb6a7fafe01657b16
Merge branch 'MDL-35794_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE