]> git.ipfire.org Git - people/dweismueller/ipfire-2.x.git/commitdiff
projects / people / dweismueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 01e64ad df24f32)
Merge branch 'seventeen' of git.ipfire.org:/pub/git/ipfire-2.x into seventeen
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 27 Nov 2014 06:34:41 +0000 (07:34 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 27 Nov 2014 06:34:41 +0000 (07:34 +0100)

Trivial merge
Daniel's tree of IPFire 2.x.