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

[Simone Caronni]

commit 8b9bd002bc2dbaaf3cfb44ea339b2cbb9586c60c
Merge: 091e528 0a76abc
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Thu Apr 4 17:49:01 2013 +0200

    Merge branch 'master' into f17

 bacula-docs.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---