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

[Simone Caronni]

commit 8250238b10ff83e168758586e641becf2b95de79
Merge: 4d6d674 61d9b5e
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Tue May 28 15:11:26 2013 +0200

    Merge branch 'master' into f18

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