]> git.ipfire.org Git - people/pmueller/ipfire-3.x.git/commitdiff
projects / people / pmueller / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0e13ce8 95eaffe)
Merge remote-tracking branch 'stevee/sqlite'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 4 Mar 2012 20:18:28 +0000 (21:18 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 4 Mar 2012 20:18:28 +0000 (21:18 +0100)

Trivial merge
Peter's tree of IPFire 3.x