]> 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: 170e92a cd410c5)
Merge remote branch 'stevee/naoki'
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 11 Feb 2010 11:20:02 +0000 (12:20 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 11 Feb 2010 11:20:02 +0000 (12:20 +0100)
Conflicts:
pkgs/core/sqlite/sqlite.nm


Trivial merge
IPFire 3.x development tree