]> 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: 532b997 af2dcb4)
Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 9 Dec 2013 23:13:20 +0000 (00:13 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 9 Dec 2013 23:13:20 +0000 (00:13 +0100)

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