]> 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: 71c7c48 fd88f2e)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorBen Schweikert <trikolon@ipfire.org>
Sat, 16 Feb 2013 19:25:05 +0000 (20:25 +0100)
committerBen Schweikert <trikolon@ipfire.org>
Sat, 16 Feb 2013 19:25:05 +0000 (20:25 +0100)

Trivial merge
Peter's tree of IPFire 2.x