]> 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: a3a0aef 086eb9b)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMatthias Fischer <fischerm@ipfire.org>
Wed, 6 May 2015 18:12:22 +0000 (20:12 +0200)
committerMatthias Fischer <fischerm@ipfire.org>
Wed, 6 May 2015 18:12:22 +0000 (20:12 +0200)

Trivial merge
Peter's tree of IPFire 2.x