]> 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: 64474e3 86661c9)
Merge remote-tracking branch 'ms/timezone-transision' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 29 Jan 2014 13:40:53 +0000 (14:40 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 29 Jan 2014 13:40:53 +0000 (14:40 +0100)
1  2 
config/rootfiles/common/stage2 patch | diff1 | diff2 | blob | history

diff --cc config/rootfiles/common/stage2
Simple merge
Peter's tree of IPFire 2.x