]> 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: 5cf2c33 b376fae)
Merge remote-tracking branch 'amarx/10352' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 29 Apr 2013 11:14:46 +0000 (13:14 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 29 Apr 2013 11:14:46 +0000 (13:14 +0200)

Trivial merge
Peter's tree of IPFire 2.x