| commit | 4acca1a7a4e352344cc46068b8750a55cdc7b847 | [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 | 7746bd896cad483ae5f32ce930a60a2432ba53d2 [diff] |
nat: Redo a merge with master that got lost on the cherry-pick