Merge remote-tracking branch 'stevee/next-cgi-geoip' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 5 May 2015 10:16:58 +0000 (12:16 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 5 May 2015 10:16:58 +0000 (12:16 +0200)

Trivial merge