]> git.ipfire.org Git - people/amarx/ipfire-3.x.git/commitdiff
projects / people / amarx / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ec040d8 811ceba)
Merge remote-tracking branch 'stevee/ulogd-update'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 22 Jul 2012 19:23:56 +0000 (21:23 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 22 Jul 2012 19:23:56 +0000 (21:23 +0200)

Trivial merge
Alex's tree of IPFire 3.x