[weechat/el6: 34/35] Merge branch 'master' into el6

[Russell William Golden]

commit 0f850bbb9c97b2c258116ac83f55f98879910fb1
Merge: 4a61d46 48139c8
Author: Russell William Golden <niveusluna at niveusluna.org>
Date:   Sun Mar 18 10:35:20 2012 -0500

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	sources
    	weechat.spec

 .gitignore             |    7 +
 sources                |    4 +
 weechat-combined.patch |  700 ++++++++++++++++++++++++++++++++++++++++++++++++
 weechat.spec           |    9 +-
 4 files changed, 718 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 1c947e3,56bbb11..5da1fc2
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,5 +1,10 @@@
  weechat-0.3.2.tar.bz2
++<<<<<<< HEAD
 +/weechat-0.3.6.tar.bz2
 +/weechat-combined.patch
++=======
+ /weechat-0.3.3.tar.bz2
+ /weechat-0.3.5.tar.bz2
+ /weechat-0.3.6.tar.bz2
+ /weechat-0.3.7.tar.bz2
++>>>>>>> master
diff --cc sources
index 29ab6a2,63542fd..df70ac0
--- a/sources
+++ b/sources
@@@ -1,3 -1,1 +1,7 @@@
++<<<<<<< HEAD
 +b0b00b321203dd5746a25248a9adaa92  weechat-0.3.2.tar.bz2
 +db2392b8e31738f79f0898f77eda8daa  weechat-0.3.6.tar.bz2
 +a0f6de790d11cfda556b627fa98c0993  weechat-combined.patch
++=======
+ 62bb5002b2ba9e5816dfeededc3fa276  weechat-0.3.7.tar.bz2
++>>>>>>> master
diff --cc weechat.spec
index fe3ce3d,d22ebdd..2f90508
--- a/weechat.spec
+++ b/weechat.spec
@@@ -66,9 -67,12 +67,13 @@@ rm -rf $RPM_BUILD_ROO
  %{_libdir}/pkgconfig/*.pc
  
  %changelog
- * Thu Mar 8 2012 Russell Golden <niveusluna at niveusluna.org> - 0.3.7-1
 -* Fri Mar 16 2012 Paul P. Komkoff Jr <i at stingr.net> - 0.3.7-1
++<<<<<<< HEAD
++* Sun Mar 18 2012 Russell Golden <niveusluna at niveusluna.org> - 0.3.7-1
  - new upstream version
  
+ * Wed Feb 08 2012 Bohuslav Kabrda <bkabrda at redhat.com> - 0.3.6-2
+ - Rebuilt for Ruby 1.9.3.
+ 
  * Wed Jan 18 2012 Paul P. Komkoff Jr <i at stingr.net> - 0.3.6-1
  - new upstream version