]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 220c933 4f6e3ae)
Merge branch 'master' into core65
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 17 Dec 2012 21:09:30 +0000 (22:09 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 17 Dec 2012 21:09:30 +0000 (22:09 +0100)

Trivial merge
IPFire 2.x development tree