]> 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: 943e97c a6da9ed)
Merge remote branch 'ms/installer' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 15 Sep 2010 17:38:16 +0000 (19:38 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 15 Sep 2010 17:38:16 +0000 (19:38 +0200)

Trivial merge
IPFire 3.x development tree