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)

Trivial merge