From: Peter Schaefer <schaeferpm@gmail.com>
Date: Fri, 12 Apr 2013 16:46:22 +0000 (+0200)
Subject: Merge branch 'master' of papillion.dyndns.ws:bacc
X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=ff0d1e20a3784e8d40705ffa53686c525f7c598a;p=bacc.git

Merge branch 'master' of papillion.dyndns.ws:bacc
---

ff0d1e20a3784e8d40705ffa53686c525f7c598a