]> 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: ac9f1a3 bc29120)
Merge commit 'bc291208bf67e81be57b0a6d27891140a650ec82'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 22 Jul 2012 09:06:44 +0000 (11:06 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 22 Jul 2012 09:06:44 +0000 (11:06 +0200)

Trivial merge
IPFire 3.x development tree