[clac: 4/4] Merge remote branch 'origin/el5/master'

[Manuel Wolfshant]

commit 146fa4cd801de65ec9c4dda103345b060c449f09
Merge: 2fe4046 0e61aaa
Author: Manuel Wolfshant <wolfy at fedoraproject.org>
Date:   Fri Oct 1 01:22:15 2010 +0300

    Merge remote branch 'origin/el5/master'
    
    Conflicts:
    	.gitignore
    	clac.spec
    
    new upstream version

 .gitignore |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---