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

[Simone Caronni]

commit 9e3f7528cac1dfe2f07f6b03542425155ed08f64
Merge: 253d1a0 c1620e0
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Mon Sep 24 09:57:00 2012 +0200

    Merge branch 'f18' into f17

 .gitignore       |    1 +
 bacula-docs.spec |    5 ++++-
 sources          |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---