[weechat: 14/15] Merge remote branch 'origin/el6/master'

[Paul P Komkoff Jr]

commit 26c496b10e94f59a4e121c250614d8fe0a5a61b4
Merge: a0a6779 491eb55
Author: Paul P. Komkoff Jr <i at stingr.net>
Date:   Wed Aug 25 17:33:31 2010 +0100

    Merge remote branch 'origin/el6/master'
    
    Conflicts:
    	weechat.spec

 weechat.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc weechat.spec
index fc9f611,786c829..9d47dfd
--- a/weechat.spec
+++ b/weechat.spec
@@@ -70,9 -70,6 +70,12 @@@ rm -rf $RPM_BUILD_ROO
  %{_libdir}/pkgconfig/*.pc
  
  %changelog
++<<<<<<< HEAD
 +* Tue Jul 27 2010 David Malcolm <dmalcolm at redhat.com> - 0.3.2-3
 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 +
++=======
++>>>>>>> origin/el6/master
  * Fri May  7 2010 Paul P. Komkoff Jr <i at stingr.net> - 0.3.2-2
  - spec file fix