Merge branch 'upstream' (Lucid->Precise transition)
authorAlex Dehnert <adehnert@mit.edu>
Mon, 27 Aug 2012 03:58:19 +0000 (23:58 -0400)
committerAlex Dehnert <adehnert@mit.edu>
Mon, 27 Aug 2012 05:15:01 +0000 (01:15 -0400)
commit0637072e2f3a9898a6166b344587d9663f8ba632
tree3a88ced9b434f5232a23e2e8fda97147d38e261e
parentd9e80dbc98c60de24e8bd3ded98f2c900ff1bb87
parent02f40af4ac9fee81306c5d0182fa4c480c1a22f5
Merge branch 'upstream' (Lucid->Precise transition)
conf.d/10-auth.conf
conf.d/10-logging.conf
conf.d/10-mail.conf
conf.d/10-master.conf
conf.d/10-ssl.conf
conf.d/15-lda.conf
conf.d/auth-passwdfile.conf.ext