Merge remote-tracking branch 'stevee/squid-zph-qos' into beyond-next
[people/teissler/ipfire-2.x.git] / .mailmap
2010-01-23  Arne FitzenreiterMerge branch 'master' of ssh://arne_f@ipfire.org/pub...
2010-01-22  Michael TremerAdd .mailmap.