Automated merge with http://gredler.at/hg/olsrd
authorBernd Petrovitsch <bernd@firmix.at>
Sun, 7 Sep 2008 21:25:59 +0000 (23:25 +0200)
committerBernd Petrovitsch <bernd@firmix.at>
Sun, 7 Sep 2008 21:25:59 +0000 (23:25 +0200)
commit5162ed0b259e16b6dc0bd8001ea829bdf485c372
tree9d2902c7798462397b9823f4889ebf97a1d94ca5
parenta5868540525faa9fb345205129a3a579057cefe3
parent843d15453cb1795ae2c65a1cfe56ecee57f29b5a
Automated merge with http://gredler.at/hg/olsrd