]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d54a2ce db5b5de)
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
IPFire 2.x development tree