[bacula/f17: 2/2] Merge branch 'master' into f17

[Simone Caronni]

commit 3f2b628ccc11ca42b8900b1dea08099bf153b93d
Merge: f7a2a7b 341be93
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Mon Jul 16 11:02:28 2012 +0200

    Merge branch 'master' into f17

 bacula.logrotate |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---