]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f63cb53 dfbee17)
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
Timo's tree of IPFire 2.x