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

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

f2f7e8cdb34416c42f4676c5183e6559f86478c5