]> 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: 5720224 9f2ffaa)
Merge remote branch 'stevee/libnih'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 2 Jan 2011 16:12:40 +0000 (17:12 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 2 Jan 2011 16:12:40 +0000 (17:12 +0100)

Trivial merge
IPFire 3.x development tree