]> git.ipfire.org Git - people/ms/ipfire-2.x.git/commitdiff
projects / people / ms / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 74fd06b 7fa1b16)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 8 May 2014 14:15:13 +0000 (16:15 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 8 May 2014 14:15:13 +0000 (16:15 +0200)

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