Merge branch 'w07_MDL-25778_20_defaultcity' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Feb 2011 11:40:43 +0000 (12:40 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Feb 2011 11:40:43 +0000 (12:40 +0100)
commitda622b497b0c443c2c07d1b9726d0ff97d3a34b8
tree551a0f49df2f7b58e03dbe6065a2f8ecf78cf008
parent9aaa767c80a3444205bc025daade77c8094e2103
parent9449d0c5e8a8203293261a5100b2e562c9173930
Merge branch 'w07_MDL-25778_20_defaultcity' of git://github.com/skodak/moodle