]> 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: b860c9a 3008658)
Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 18 Feb 2013 06:47:45 +0000 (07:47 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 18 Feb 2013 06:47:45 +0000 (07:47 +0100)

Trivial merge
IPFire 2.x development tree