Merge branch 'debian'
authorClinton Ebadi <clinton@unknownlamer.org>
Wed, 30 Apr 2014 03:07:48 +0000 (23:07 -0400)
committerClinton Ebadi <clinton@unknownlamer.org>
Wed, 30 Apr 2014 03:07:48 +0000 (23:07 -0400)
commitf77892e671e1261ec26e5133f86b8a52635f3dd2
tree2cdd48aee639d7a1d79bac40579eabbd3b568205
parent781cfcb8fd50934c470e0dabf79d32ab333dec68
parent01037b081eab5fb3f208489dc3e052ec3a2c8ba1
Merge branch 'debian'

Conflicts:
debian/changelog
authpam.c
courier_auth_config.h
debian/changelog
preauthuserdbcommon.c