]> 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: 4023155 78c574e)
Merge remote-tracking branch 'stevee/automake'
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 7 Jan 2012 11:21:16 +0000 (12:21 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 7 Jan 2012 11:21:16 +0000 (12:21 +0100)

Trivial merge
IPFire 3.x development tree