Merge remote-tracking branch 'origin/mdb.master'
authorHoward Chu <hyc@openldap.org>
Wed, 19 Dec 2012 21:20:50 +0000 (13:20 -0800)
committerHoward Chu <hyc@openldap.org>
Wed, 19 Dec 2012 21:20:50 +0000 (13:20 -0800)
commit5e1dbc48aba7e9fb96ac1f6d3bd0abc7f38451ab
tree5e3508bc1e8ba2ce35d6d29bdd5aaae21d690cdb
parent5f9f68e98a3998a29d02a4f15fb5002330355231
parent057e0686303444d56f29a7bee0536e261fdf0b6a
Merge remote-tracking branch 'origin/mdb.master'