Merge branch 'master' of git://dev.medozas.de/suse-firewall
authorLudwig Nussel <ludwig.nussel@suse.de>
Tue, 29 Jun 2010 08:43:50 +0000 (10:43 +0200)
committerLudwig Nussel <ludwig.nussel@suse.de>
Tue, 29 Jun 2010 08:46:24 +0000 (10:46 +0200)
commita6667b283f2d8861fc233a5e636c8f35f4a03586
tree39e51f72922331ce5ec7e7b097aeb378325f2acb
parent04f6cd9f156b2df63f3f136b74ed67211c8e3da1
parentfae373a2a185313b7ad03f795e7d5684d63f3c25
Merge branch 'master' of git://dev.medozas.de/suse-firewall

Conflicts:
SuSEfirewall2
SuSEfirewall2