commit | fb7a934cfcafcd8a02969747b8427d87ec4cc305 | [log] [tgz] |
---|---|---|
author | Holger Hans Peter Freyther <zecke@selfish.org> | Tue Jun 15 19:14:12 2010 +0800 |
committer | Holger Hans Peter Freyther <zecke@selfish.org> | Tue Jun 15 20:24:12 2010 +0800 |
tree | ff14de669a0f349edc2e3069006b5d30cfac7f0c | |
parent | 6b087d18f5e0df654bdbbef18b79988d8e49b7ce [diff] |
nat: Redo a merge with master that got lost on the cherry-pick