]> 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: 3650d2d e8addce)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 24 Jun 2012 11:44:46 +0000 (13:44 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 24 Jun 2012 11:44:46 +0000 (13:44 +0200)

Trivial merge
IPFire 3.x development tree