Merge branch 'next' of https://github.com/ipfire/ipfire-2.x into feature_firewalllog_...
[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.