Merge branch 'on-waves/nat-alloc-bsc-endpoints'0.9.5
commitafdb522ced650109822d6ab4226f1c566036f1ac
authorHolger Hans Peter Freyther <zecke@selfish.org>
Wed, 1 Sep 2010 11:10:17 +0000 (1 19:10 +0800)
committerHolger Hans Peter Freyther <zecke@selfish.org>
Wed, 1 Sep 2010 11:10:17 +0000 (1 19:10 +0800)
tree02328ef1478b966eae19a5b07866e9aae148b000
parent9ae28a128af27a755aa889d2edd8340815f9a3df
parent85902a4d4a53094e8ab4cb242e8de1f6ce431f9e
Merge branch 'on-waves/nat-alloc-bsc-endpoints'