From: Jan-Pascal van Best <janpascal@vanbest.org>
Date: Mon, 29 Aug 2011 10:53:11 +0000 (+0200)
Subject: Merge branch 'master' into debian
X-Git-Tag: debian/0.1-1_pre1~1
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=c26358400e3bef9c0ec2b611374bf55e08df9f3e;p=backupusage.git

Merge branch 'master' into debian
---

c26358400e3bef9c0ec2b611374bf55e08df9f3e