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

[Simone Caronni]

commit 41fc9875eb8083d0a883db661eab1f89662765bf
Merge: e467705 0018470
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Mon Jun 4 11:51:11 2012 +0200

    Merge branch 'master' into f17

 .gitignore       |    1 +
 bacula-docs.spec |   30 +++++++++++++++++-------------
 sources          |    3 +--
 3 files changed, 19 insertions(+), 15 deletions(-)
---