From: martinko <gamato@users.sf.net>
Date: Wed, 29 Oct 2014 08:51:14 +0000 (+0100)
Subject: Merge branch 'hotfix/3.2.5' into develop
X-Git-Tag: 3.2.6^2~1^2~1
X-Git-Url: http://waps.l3s.uni-hannover.de/gitweb/%20?a=commitdiff_plain;h=92e494f17b4d8918c92663fd29c386e609d1f700;p=skytools.git

Merge branch 'hotfix/3.2.5' into develop
---

92e494f17b4d8918c92663fd29c386e609d1f700