]> 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: fdec431 9f82cdb)
Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 2 May 2012 14:55:26 +0000 (16:55 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 2 May 2012 14:55:26 +0000 (16:55 +0200)

Trivial merge
IPFire 2.x development tree