From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 29 Dec 2012 17:37:36 +0000 (+0100)
Subject: Merge branch 'Branch_5_2'
X-Git-Tag: v5.3-rc1~1608^2
X-Git-Url: https://scm.fusionforge.org/anonscm/gitweb?p=fusionforge%2Ffusionforge.git;a=commitdiff_plain;h=8300afe0d11cd3ef24b12fb2c394ead53611d523

Merge branch 'Branch_5_2'
---

8300afe0d11cd3ef24b12fb2c394ead53611d523