]> git.ipfire.org Git - people/stevee/ipfire-3.x.git/commitdiff
projects / people / stevee / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d34edaf bce502b)
Merge remote-tracking branch 'stevee/parted-update'
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 12 Feb 2013 18:37:43 +0000 (19:37 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 12 Feb 2013 18:37:43 +0000 (19:37 +0100)

Trivial merge
Stefan's tree of IPFire 3.x.