From: Peter Schaefer <peter.schaefer@tuwien.ac.at>
Date: Fri, 29 Mar 2013 14:24:31 +0000 (+0100)
Subject: Merge branch 'master' of ambrosia:bacc
X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=1674860b906016756b207fef22d4ffd22cd88d02;p=bacc.git

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

1674860b906016756b207fef22d4ffd22cd88d02