]> 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: 40c7cdd 1238e6d)
Merge branch 'thirteen' of git.ipfire.org:/pub/git/ipfire-2.x into thirteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 5 Nov 2012 10:24:50 +0000 (11:24 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 5 Nov 2012 10:24:50 +0000 (11:24 +0100)

Trivial merge
IPFire 2.x development tree