]> 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: fde9c9d 1245aa7)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorStefan Schantl <stefan.schantl@ipfire.org>
Mon, 20 Apr 2015 17:03:52 +0000 (19:03 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Mon, 20 Apr 2015 17:03:52 +0000 (19:03 +0200)

Trivial merge
Peter's tree of IPFire 2.x