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

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