From: Peter Schaefer <peter.schaefer@tuwien.ac.at>
Date: Mon, 10 Dec 2012 17:09:17 +0000 (+0100)
Subject: Merge branch 'master' of papillion.dyndns.ws:bacc
X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=dfade58a0596aa4c3f7b5125cfab72e268b5ab3e;p=bacc.git

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

dfade58a0596aa4c3f7b5125cfab72e268b5ab3e