]> 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: 1fdebd8 96d0fe5)
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorChristian Schmidt <christian.schmidt@ipfire.org>
Sat, 9 Oct 2010 14:22:23 +0000 (16:22 +0200)
committerChristian Schmidt <christian.schmidt@ipfire.org>
Sat, 9 Oct 2010 14:22:23 +0000 (16:22 +0200)

Trivial merge
IPFire 2.x development tree