]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
projects / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba23c23 9b6f6f2)
Merge commit '9b6f6f2ef960a1225d84dcae863c7d2856b2d359'
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 27 Jul 2010 11:48:59 +0000 (13:48 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 27 Jul 2010 11:48:59 +0000 (13:48 +0200)

Trivial merge
IPFire 3.x development tree