Merge commit 'origin/bug-894' into bug-894
authordirk <beliebige_email_adresse@fidocon.de>
Tue, 25 Oct 2011 21:41:03 +0000 (23:41 +0200)
committerdirk <beliebige_email_adresse@fidocon.de>
Tue, 25 Oct 2011 21:41:03 +0000 (23:41 +0200)
commit490f6a8d248599e2fd14ef8dd82de6e58ca3c503
tree029983762d241785c517723ac3827e13c762e55b
parentebe60f6955d40ca78c5a06fceffe940e92298f6b
parentefe894174daea27745c2db57279972174f3f387a
Merge commit 'origin/bug-894' into bug-894