[pidgin-sipe/el6/master: 20/20] merge master

[jokajak]

commit 8d798f24148bbedc0a3516370b2ee25ad8625d97
Merge: 9cf2f92 db4389d
Author: Josh <jokajak at gmail.com>
Date:   Sat Apr 9 09:52:31 2011 -0400

    merge master

 .gitignore       |    2 ++
 pidgin-sipe.spec |   18 +++++++++++++++---
 sources          |    2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)
---