]> 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 | compact (merge: 6b69683 85abeb1)
Merge remote-tracking branch 'amarx/BUG10753' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 26 Feb 2015 10:11:04 +0000 (11:11 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 26 Feb 2015 10:11:04 +0000 (11:11 +0100)

Trivial merge
Peter's tree of IPFire 2.x