[supybot-gribble/f15] Updated to upstream latest

[Dave Riches]

commit 2fb80f4bac3caeb472a52835df86ff066342debf
Author: Dave Riches <david.r at ultracar.co.uk>
Date:   Sun Oct 16 12:13:09 2011 +0100

    Updated to upstream latest

 .gitignore |    4 ----
 sources    |    6 +-----
 2 files changed, 1 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 75844a6..40cb4b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1 @@
-/supybot-gribble-20110627.tar
-<<<<<<< HEAD
-=======
 /supybot-gribble-20111016.tar
->>>>>>> master
diff --git a/sources b/sources
index 651d2d8..ee150a8 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-8e62dc8bd25ed5b45424df7b40358eec  supybot-gribble-20110627.tar
-=======
-98d48242a278deab6fed94ddf7915749  supybot-gribble-20111016.tar
->>>>>>> master
+8d48242a278deab6fed94ddf7915749  supybot-gribble-20111016.tar