]> 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: 8516edc db2e0a5)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into BUG10730
authorAlexander Marx <alexander.marx@ipfire.org>
Tue, 3 Feb 2015 06:27:03 +0000 (07:27 +0100)
committerAlexander Marx <alexander.marx@ipfire.org>
Tue, 3 Feb 2015 06:27:03 +0000 (07:27 +0100)

Trivial merge
Peter's tree of IPFire 2.x