[pidgin/f16: 8/8] Merge branch 'f17' into f16

[Jon Ciesla]

commit 2691bbc3d87a1940c1b8e70a8bdcacdfb897c5b7
Merge: cc86762 b42219c
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Fri Mar 23 11:18:29 2012 -0500

    Merge branch 'f17' into f16
    
    Conflicts:
    	pidgin.spec

 .gitignore              |    1 +
 pidgin.spec             |   39 +-
 port-to-farstream.patch | 2476 +++++++++++++++++++++++++++++++++++++++++++++++
 sources                 |    2 +-
 4 files changed, 2508 insertions(+), 10 deletions(-)
---
diff --cc pidgin.spec
index 1797297,d5dced6..0964a48
--- a/pidgin.spec
+++ b/pidgin.spec
@@@ -696,8 -705,20 +705,20 @@@ rm -rf $RPM_BUILD_ROO
  %endif
  
  %changelog
+ * Fri Mar 23 2012 Jon Ciesla <limburgher at gmail.com> - 2.10.2-1
+ - Update to 2.10.2, BZ 803293, 803299.
+ - Dropping MSN patches.  Protocol patch not needed, won't connect
+ - to 16 by default.  Crash patch was upstreamed.
+ - Dropped nm09 patch, upstreamed.
+ 
+ * Fri Mar  9 2012 Tom Callaway <spot at fedoraproject.org> - 2.10.1-4
+ - fedora 17+ uses farstream now instead of farsight2
+ 
+ * Wed Jan 18 2012 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-3
+ - Map RHEL 7 to Fedora 16 (for now).
+ 
 -* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.10.1-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 +* Wed Jan 18 2012 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-2
 +- Map RHEL 7 to Fedora 16 (for now).
  
  * Thu Dec 29 2011 Stu Tomlinson <stu at nosnilmot.com> 2.10.1-1
  - 2.10.1, includes security fixes for CVE-2011-3594, CVE-2011-4601,