From: Peter Schaefer <peter.schaefer@tuwien.ac.at>
Date: Mon, 2 Apr 2012 18:18:11 +0000 (+0200)
Subject: Merge branch 'master' of ambrosia:bacc
X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=9433575340f0650bb86de6abfc2a2ee5b42a00ef;p=bacc.git

Merge branch 'master' of ambrosia:bacc
---

9433575340f0650bb86de6abfc2a2ee5b42a00ef