From: Sebastian Bachmann <me@free-minds.net>
Date: Sat, 4 May 2013 12:04:20 +0000 (+0200)
Subject: Merge branch 'master' of debienna.at:debienna
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;ds=sidebyside;h=5dca45f5f030b5be42310e45d4117bc5decf0004;hp=5dca45f5f030b5be42310e45d4117bc5decf0004;p=debienna.git

Merge branch 'master' of debienna.at:debienna
---