]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb71011 ef3bc86)
Merge branch 'thirteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into thirteen
authorArne Fitzenreiter <Arne_F@ipfire.org>
Wed, 28 Nov 2012 15:34:45 +0000 (16:34 +0100)
committerArne Fitzenreiter <Arne_F@ipfire.org>
Wed, 28 Nov 2012 15:34:45 +0000 (16:34 +0100)

Trivial merge
IPFire 2.x development tree