[zarafa/f15/master: 3/3] Merge branch 'f15/master' of ssh://pkgs.fedoraproject.org/zarafa into f15

[Robert Scheck]

commit 97566cb8660292aeb2268ecb97c7e4195cee9aa2
Merge: df8baf3 58913a2
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Thu Mar 24 06:59:31 2011 +0100

    Merge branch 'f15/master' of ssh://pkgs.fedoraproject.org/zarafa into f15
    
    Conflicts:
    	zarafa.spec

 zarafa.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---