Merge branch 'bugfixes' into 3.1
authorautomerge <cron@wz2100.net>
Fri, 13 Jul 2012 06:10:03 +0000 (08:10 +0200)
committercybersphinx <chr.ohm@gmx.net>
Fri, 13 Jul 2012 06:10:04 +0000 (08:10 +0200)
commitaa676c18bbf496fd62485c1b9cf9d8b9eeae87b3
tree569d81b93733168ecd9b713236f869a20894fd51
parente370f0f707edfaea8027c9b20e9c97426914e784
parentd2a8a134a6c3a08d20e461425a9714ab52ee78b8
Merge branch 'bugfixes' into 3.1