Merge remote-tracking branch 'stevee/next-cgi-geoip' into next
authorStefan Schantl <stefan.schantl@ipfire.org>
Mon, 4 May 2015 18:16:24 +0000 (20:16 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Mon, 4 May 2015 18:16:24 +0000 (20:16 +0200)

Trivial merge