]> 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: d71bcfc 6ae884e)
Merge remote-tracking branch 'teissler/Bug_10415' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 27 Sep 2014 18:43:23 +0000 (20:43 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 27 Sep 2014 18:43:23 +0000 (20:43 +0200)

Trivial merge
Peter's tree of IPFire 2.x