Merge in r2811:2875 from trunk
authorJulien Kerihuel <j.kerihuel@openchange.org>
Tue, 21 Feb 2012 17:53:17 +0000 (17:53 +0000)
committerJulien Kerihuel <j.kerihuel@openchange.org>
Tue, 21 Feb 2012 17:53:17 +0000 (17:53 +0000)
commit272dc71736154f8316e051bc9aadd01984f81181
treed6fc7988a6043bb83991ef31ee3669563f89068e
parent580c84daf238e18de831d5e4f6594250979451bc
Merge in r2811:2875 from trunk
14 files changed:
libmapi/FXICS.c
libmapi/libmapi.h
libmapi/mapi_nameid.h
libmapi/mapi_nameid_private.h
libmapi/property_altnames.h
libmapi/property_tags.c
libmapi/property_tags.h
mapiproxy/libmapiproxy/openchangedb_property.c
mapiproxy/servers/default/nspi/dcesrv_exchange_nsp.c
properties_enum.h
pyopenchange/pymapi_properties.c
script/makepropslist.py
utils/mapitest/module.c
utils/mapitest/modules/module_oxcfxics.c