Merge branch 'MDL-37896_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE
commit017382e6d3511811fb8c0a966ade2be58989282f
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Feb 2013 00:14:24 +0000 (12 01:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Feb 2013 00:14:24 +0000 (12 01:14 +0100)
treee4931b617f12feacc176a9ec880372e1fa9c01c6
parent0eab91dccea69ca87d43b8ec74d8dbe46dad1ec2
parent2de365981090cd338b966be0b20b802fca11130e
Merge branch 'MDL-37896_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE