]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ee7776 8b33e6d)
Merge branch 'uap' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 5 Nov 2011 16:10:35 +0000 (17:10 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 5 Nov 2011 16:10:35 +0000 (17:10 +0100)

Trivial merge
Timo's tree of IPFire 2.x