From: Eloy Lafuente (stronk7) Date: Mon, 24 Oct 2011 21:03:11 +0000 (+0200) Subject: Merge branch 'w42_MDL-29880_m22_geoip' of git://github.com/skodak/moodle X-Git-Tag: v2.2.0-beta~168 X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=918ecf1754fd704ef22a7602a8e2e05f7ce2560a Merge branch 'w42_MDL-29880_m22_geoip' of git://github.com/skodak/moodle --- 918ecf1754fd704ef22a7602a8e2e05f7ce2560a