Merge branch 'ldap'
authorMichael Spang <mspang@uwaterloo.ca>
Mon, 19 Feb 2007 02:50:51 +0000 (21:50 -0500)
committerMichael Spang <mspang@uwaterloo.ca>
Mon, 19 Feb 2007 02:50:51 +0000 (21:50 -0500)
commit6ab575ec9e2169fda7c8d7b2a3796b08dc3ddc5d
treea361fdc36a91ee34325a5a13fb81a135713cfbcb
parentc2912751d84586ad31d564a2b3a90c2c7586a5d5
parent7b81a13f7877b9bc0d0878401159ef415a6d21e9
Merge branch 'ldap'