]> 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: 80e4980 741fa41)
Merge branch 'master' of git.ipfire.org:/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 18 Feb 2015 23:11:13 +0000 (00:11 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 18 Feb 2015 23:11:13 +0000 (00:11 +0100)

Trivial merge
IPFire 2.x development tree