]> 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: 85cfb67 5bc4053)
Merge remote-tracking branch 'stevee/m4'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 27 Nov 2011 10:46:14 +0000 (11:46 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 27 Nov 2011 10:46:14 +0000 (11:46 +0100)

Trivial merge
IPFire 3.x development tree