Merge branch 'w30_MDL-40796_m26_citycountry' of https://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 18:29:43 +0000 (20:29 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 18:29:43 +0000 (20:29 +0200)
commitcbc4aa8cfe68e13fcf43859ac8d3949ce4ce5aaf
tree95615ac8d871961f07ba6b88db9c3e9d46f4abca
parent070a1bf23fe11397da0d8679e04ec1e5a2b37781
parentff539362a6fdb47e4820453f7babb1c028e2f0f0
Merge branch 'w30_MDL-40796_m26_citycountry' of https://github.com/skodak/moodle