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

[Simone Caronni]

commit 253d1a05685a78e54c886fd841b096a7c1d23ffd
Merge: 1207766 4f9add3
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Tue Sep 11 14:18:38 2012 +0200

    Merge branch 'master' into f17

 .gitignore       |    1 +
 bacula-docs.spec |    9 ++++++---
 sources          |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---