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

Tue Sep 14 05:07:43 UTC 2010

commit 0102560cfec4a413f811afeb1aeb0b2004d2ea19
Merge: 2fdb23a baf18b6
Author: Yuri Timofeev <tim4dev at gmail.com>
Date:   Tue Sep 14 08:03:24 2010 +0300

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

---