Merge remote-tracking branch 'stevee/core-90-geoip' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 18 Apr 2015 14:15:17 +0000 (16:15 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 18 Apr 2015 14:15:17 +0000 (16:15 +0200)

Trivial merge