Merge branch 'bugfixes'
authorautomerge <cron@wz2100.net>
Mon, 16 Jul 2012 06:00:11 +0000 (08:00 +0200)
committercybersphinx <chr.ohm@gmx.net>
Mon, 16 Jul 2012 06:00:12 +0000 (08:00 +0200)
commitbb76dbc141027b942cbc00c456e6689a1abb6ec5
treeb717bf39bac419f2fc2eb99fbf1bfeef9953cf0f
parent650229d90537e5cbad45f92284ca71af965a0456
parent0bfee185a38c1a354c14b33a064d13d81a03962f
Merge branch 'bugfixes'