Merge branch 'bugfixes'
authorautomerge <cron@wz2100.net>
Mon, 24 Dec 2012 07:01:21 +0000 (08:01 +0100)
committercybersphinx <chr.ohm@gmx.net>
Mon, 24 Dec 2012 07:01:21 +0000 (08:01 +0100)
commit0540be80580789d379ae456c3eb31c471f688bab
treee40aed198b9d137db0139a99521b635b9fe1a63b
parent3b766d7043d6de8f293a898d3286ada93eecda24
parent4e2f4bbf3cd5e03e58b9b67fcf370bff088e6d91
Merge branch 'bugfixes'