merge closing of 2.5 branch

This commit is contained in:
Martin v. Löwis 2011-10-31 12:39:25 +01:00
commit 141e770e8f

Diff content is not available