Merge branch 'debian'

Conflicts:
	debian/changelog

diff --cc authpam.c
Simple merge

diff --cc courier_auth_config.h
Simple merge

diff --cc debian/changelog
index 6638f2c,00b3c65..4dd64b5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,13 +1,19 @@@
+ courier-authlib (0.66.1-1) unstable; urgency=low
+ 
+   * New upstream release.
+ 
+   [Willi Mann <willi@debian.org>]
+ 
+   * Fix libtool breakage by explicitly using /bin/bash in debian/rules.
+ 
+  -- Stefan Hornburg (Racke) <racke@linuxia.de>  Mon, 28 Oct 2013 11:38:37 +0100
+ 
 +courier-authlib (0.63.0-6+hcoop1) unstable; urgency=medium
 +
 +  * Merged HCoop changes
 +
 + -- Clinton Ebadi <clinton@neurasthenic.home.unknownlamer.org>  Tue, 29 Apr 2014 20:17:45 -0400
 +
  courier-authlib (0.63.0-6) unstable; urgency=low
  
    [Martin Orr <martin@martinorr.name>]

diff --cc preauthuserdbcommon.c
index a37d744,e39decb..6c29778
--- 1/preauthuserdbcommon.c
--- 2/preauthuserdbcommon.c
+++ b/preauthuserdbcommon.c
@@@ -19,10 -19,7 +19,9 @@@
  #include      "courierauthdebug.h"
  #include      "userdb/userdb.h"
  
- static const char rcsid[]="$Id: preauthuserdbcommon.c,v 1.21 2006/10/28 19:22:52 mrsam Exp $";
  
 +#define TOKEN_CMD "/etc/courier/get-token "
 +
  int auth_userdb_pre_common(const char *userid, const char *service,
        int needpass,
        int (*callback)(struct authinfo *, void *),