merged r2407
authorwsourdeau <wsourdeau@71d39326-ef09-db11-b2a4-00e04c779ad1>
Fri, 17 Dec 2010 18:48:28 +0000 (18:48 +0000)
committerwsourdeau <wsourdeau@71d39326-ef09-db11-b2a4-00e04c779ad1>
Fri, 17 Dec 2010 18:48:28 +0000 (18:48 +0000)
commit8869eacad01843eda7152e753533015af27d2a06
tree1522e9495d7e9bbb36e735a53aea098fe7d13daa
parente9e7850f9927841475f5a1828886f803537e010c
merged r2407

git-svn-id: https://svn.openchange.org/openchange@2408 71d39326-ef09-db11-b2a4-00e04c779ad1
branches/sogo/mapiproxy/libmapiserver/libmapiserver.h
branches/sogo/mapiproxy/libmapiserver/libmapiserver_oxorule.c
branches/sogo/mapiproxy/servers/default/emsmdb/dcesrv_exchange_emsmdb.c
branches/sogo/mapiproxy/servers/default/emsmdb/dcesrv_exchange_emsmdb.h
branches/sogo/mapiproxy/servers/default/emsmdb/oxorule.c