]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b59da37 f28a284)
Merge remote-tracking branch 'stevee/next-flag-icons' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 5 May 2015 10:15:55 +0000 (12:15 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 5 May 2015 10:15:55 +0000 (12:15 +0200)

Trivial merge
Peter's tree of IPFire 2.x