]> 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: 7a5553d bb9a691)
Merge remote-tracking branch 'stevee/automake-update'
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 25 May 2013 12:50:07 +0000 (14:50 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 25 May 2013 12:50:07 +0000 (14:50 +0200)

Trivial merge
IPFire 3.x development tree