From: Joerg Jaspert <joerg@debian.org>
Date: Sun, 9 Sep 2012 20:05:27 +0000 (+0200)
Subject: Merge remote-tracking branch 'drkranz/quotes' into merge
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bc262470fc93718b28b4fb4576ab80ecd0501cb0;hp=95273e36cb05e760a65f938c41350e7d8a86b0c8;p=dak.git

Merge remote-tracking branch 'drkranz/quotes' into merge

* drkranz/quotes:
  dak rul3z

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

diff --git a/docs/README.quotes b/docs/README.quotes
index 12b1e374..ff6810f7 100644
--- a/docs/README.quotes
+++ b/docs/README.quotes
@@ -363,3 +363,19 @@ Canadians: This is a lighthouse. Your call.
 <DktrKranz> may I call you Roy then?
 <Ganneff> may i kick you?
 <Ganneff> im not a geek. im married and have a son. nono geek no.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+<taffit> Hi, http://ftp-master.debian.org/deferred.html is a bit outated
+<Ganneff> yes, DktrKranz broke the code.
+<DktrKranz> nope
+<DktrKranz> it's dak's fault!
+<Ganneff> never ever.
+<Ganneff> must be you
+<jcristau> bad dak
+<Ganneff> rule 1: dak is never at fault.
+<Ganneff> rule 2: ftpmasters are always right. may cancel rule 1.
+<Ganneff> rule 3: see above.
+<ansgar> The bot is innocent!
+<DktrKranz> rule 0: there are no rules!
+* DktrKranz hides