From: Joerg Jaspert <joerg@debian.org>
Date: Wed, 29 Aug 2012 21:12:03 +0000 (+0200)
Subject: Merge remote-tracking branch 'drkranz/uid' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=b914f454352aae3e710f5169b9aef1a9371dd4a5;hp=c94ba7558e6768b5b42191ba49fade0916d10a58;p=dak.git

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

* drkranz/uid:
  queue-report: fix display of sponsor email
  Implement get_login_from_ldap function

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

diff --git a/docs/README.quotes b/docs/README.quotes
index 2b159a8f..12b1e374 100644
--- a/docs/README.quotes
+++ b/docs/README.quotes
@@ -347,3 +347,19 @@ Canadians: This is a lighthouse. Your call.
 
 <mhy> I wish they wouldnt leave biscuits out, thats just tempting. Damnit.
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+<Ganneff> WARNING 2012-08-27 20:16:19 Got unexpected notice from ChanServ on OFTC:
+<Ganneff>         IrcMsg(prefix="ChanServ!services@services.oftc.net", command="NOTICE",
+<Ganneff>         args=('dak', '[#debian-ftp] "hello, have you tried rebooting? Didn\'t
+<Ganneff>         work? Have you tried ignoring it?"')).
+<Ganneff> hihi
+<DktrKranz> actually, we could patch that notice to be "Have you tried to turn it off and on again", a-la-IT-Crowd
+<Ganneff> yeah well, but we dont want them to turn the archive off and on again
+<Ganneff> thats MY job, damn you.
+<Ganneff> i turn off cron
+<Ganneff> and forget to turn it back on
+<Ganneff> me mine my job
+<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.