From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 10 May 2012 19:48:51 +0000 (-0300)
Subject: Merge branches 'master' and 'bug/3721' into bug/3721
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=3b709c9cfd1252c360978fdf44f1d825279682db;p=backupninja.git

Merge branches 'master' and 'bug/3721' into bug/3721
---