Merge branch 'debian'
authorClinton Ebadi <clinton@unknownlamer.org>
Wed, 30 Apr 2014 00:16:58 +0000 (20:16 -0400)
committerClinton Ebadi <clinton@unknownlamer.org>
Wed, 30 Apr 2014 00:16:58 +0000 (20:16 -0400)
commit2c58f61c7faca7723da35ffd7924af764108e9fd
treeea74b489c1a9fa21d1781193c68083f44a2524e8
parentc8ffd9086f0b8cab7764e7affc843fc4429c0242
parent940be80e3e40dbbbd84161e1e5ae3abf0b2eadf6
Merge branch 'debian'

Conflicts:
debian/changelog
courier_auth_config.h
debian/changelog