Merge remote-tracking branch 'local/master' into database

diff --cc Debbugs/CGI/Bugreport.pm
Simple merge

diff --cc debian/control
index 6fadd40da5f41eb00e6e26e35aad5ab46d3945ae,36ebfcc4033320d2495e62bd2eaf44479736210d..097852d898e53d14becbc29ee907473c8a2fa655
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -13,11 -13,9 +13,10 @@@ Build-Depends-Indep: libparams-validate
   libhttp-server-simple-perl, libtest-www-mechanize-perl,
   libmail-rfc822-address-perl, libsafe-hole-perl, libuser-perl,
   libconfig-simple-perl, libtest-pod-perl, liblist-allutils-perl,
--# used by Debbugs::Libravatar and libravatar.cgi
   libfile-libmagic-perl, libgravatar-url-perl, libwww-perl, imagemagick,
-  libtext-template-perl, graphviz, libtext-iconv-perl
 + libdbix-class-perl, libdatetime-format-pg-perl,
 + libdatetime-format-mail-perl,
+  libtext-template-perl, graphviz, libtext-iconv-perl, libnet-server-perl
  Homepage: http://wiki.debian.org/Teams/Debbugs
  
  Package: debbugs