Merge branch 'bugfixes'
authorautomerge <cron@wz2100.net>
Fri, 13 Jul 2012 06:00:12 +0000 (08:00 +0200)
committercybersphinx <chr.ohm@gmx.net>
Fri, 13 Jul 2012 06:00:12 +0000 (08:00 +0200)
commit0b4745d4e6328dec49e817beb0966715053f5704
tree58c024a2a28b4740f5336340c6bf46f11260a772
parented671bb6f426d6ce70d417b19f4b03df73e4861e
parentd2a8a134a6c3a08d20e461425a9714ab52ee78b8
Merge branch 'bugfixes'