]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a5b0d8b 85cbc0a)
Merge branch 'next' of git://git.ipfire.org/ipfire-2.x into next
authorChristian Schmidt <maniacikarus@ipfire.org>
Wed, 6 Jul 2011 17:30:11 +0000 (19:30 +0200)
committerChristian Schmidt <maniacikarus@ipfire.org>
Wed, 6 Jul 2011 17:30:11 +0000 (19:30 +0200)

Trivial merge
Peter's tree of IPFire 2.x