]> 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: d9716b0 4247f58)
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorChristian Schmidt <christian.schmidt@ipfire.org>
Thu, 2 Sep 2010 18:05:11 +0000 (20:05 +0200)
committerChristian Schmidt <christian.schmidt@ipfire.org>
Thu, 2 Sep 2010 18:05:11 +0000 (20:05 +0200)

Trivial merge
IPFire 2.x development tree