]> 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: bcd7a75 851fba0)
Merge branch 'seventeen' of git.ipfire.org:/pub/git/ipfire-2.x into seventeen
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 5 Nov 2014 23:08:55 +0000 (00:08 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 5 Nov 2014 23:08:55 +0000 (00:08 +0100)

Trivial merge
IPFire 2.x development tree