[weechat/el6: 35/35] merge with master branch

[Russell William Golden]

commit df0427ea0cfcfe06af52f225ed62fc6c7d29deb6
Author: Russell William Golden <niveusluna at niveusluna.org>
Date:   Sun Mar 18 10:36:29 2012 -0500

    merge with master branch

 .gitignore |    6 ------
 sources    |    6 ------
 2 files changed, 0 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5da1fc2..c8a474d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,4 @@
-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 --git a/sources b/sources
index df70ac0..63542fd 100644
--- a/sources
+++ b/sources
@@ -1,7 +1 @@
-<<<<<<< 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