[webacula/f12/master: 10/10] Merge branch 'f12/master' of ssh://tim4dev at pkgs.fedoraproject.org/webacula into f12

[tim4dev]

commit 19727e96293933ef33ed248b3a99bf50e8c65b81
Merge: 0102560 609e2c3
Author: Yuri Timofeev <tim4dev at gmail.com>
Date:   Tue Sep 14 08:07:16 2010 +0300

    Merge branch 'f12/master' of ssh://tim4dev@pkgs.fedoraproject.org/webacula into f12
    
    Conflicts:
    
    	webacula.spec

 webacula.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --cc webacula.spec
index ac76793,ccdef23..2b20c3b
--- a/webacula.spec
+++ b/webacula.spec
@@@ -1,7 -1,7 +1,7 @@@
  Name:          webacula
 -Epoch:         1
 +Epoch:         2
  Version:       3.5
- Release:       1%{?dist}
+ Release:       2%{?dist}
  Summary:       Web interface of a Bacula backup system
  Summary(ru):   Веб интерфейс для Bacula backup system