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

[Simone Caronni]

commit 4b9e894d4a5408c29986e6503e106c9f31f5f733
Merge: d13ab08 61d9b5e
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Tue May 28 15:11:27 2013 +0200

    Merge branch 'master' into f17

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