Merge branch 'MDL-37894_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE
commit5ddaf0a8ffd72b68a164551bba6180a10a8c75bf
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Feb 2013 23:40:21 +0000 (20 00:40 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Feb 2013 23:40:21 +0000 (20 00:40 +0100)
treebe442409d9374aecb08fe91ad730ed3e3aa6310a
parent097404cd2bb38cfb8497e319dc210625479b330e
parentfd8c97d2646ac1206d6f10d33b1ac5ec93c1c6b9
Merge branch 'MDL-37894_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE