]> 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: 9a3d3d9 c7f9e0e)
Merge remote-tracking branch 'origin/thirteen' into thirteen
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 8 Sep 2012 09:05:37 +0000 (11:05 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 8 Sep 2012 09:05:37 +0000 (11:05 +0200)

Trivial merge
Peter's tree of IPFire 2.x