]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 31d619a e4061f1)
Merge remote-tracking branch 'stevee/pakfire3-fixes' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 2 Jan 2013 21:02:43 +0000 (22:02 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 2 Jan 2013 21:02:43 +0000 (22:02 +0100)

Trivial merge
Peter's tree of IPFire 2.x