commit b5ee7c3199520c019e7b8ab1e05006a4d72614e3 Merge: fbda6c4 9808fc4 Author: Simone Caronni <negativo17 at gmail.com> Date: Mon Jul 2 09:13:13 2012 +0200 Merge branch 'master' into f17 .gitignore | 1 + bacula-docs.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---