[pidgin-sipe: 7/7] Merge branch 'f13'

[Konstantin Ryabitsev]

commit 6ae17109edeebade3f6de62e39e14d63629a3671
Merge: 97a6a4b 21a8f86
Author: Konstantin Ryabitsev <icon at fedoraproject.org>
Date:   Fri Sep 24 15:28:57 2010 -0400

    Merge branch 'f13'
    
    Conflicts:
    	pidgin-sipe.spec

 pidgin-sipe.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc pidgin-sipe.spec
index 3826c34,16597f1..75a1e32
--- a/pidgin-sipe.spec
+++ b/pidgin-sipe.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:           pidgin-sipe
  Version:        1.10.1
--Release:        1%{?dist}
++Release:        2%{?dist}
  Summary:        Pidgin protocol plugin to connect to MS Office Communicator
  
  Group:          Applications/Internet