git.samba.org
/
jelmer
/
openchange-proposed.git
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7d5d968
fd5652e
)
Merge latest trunk changes into sogo branch
author
Julien Kerihuel
<j.kerihuel@openchange.org>
Wed, 1 Dec 2010 20:59:03 +0000
(20:59 +0000)
committer
Julien Kerihuel
<j.kerihuel@openchange.org>
Wed, 1 Dec 2010 20:59:03 +0000
(20:59 +0000)
1
2
mapiproxy/libmapistore/backends/mapistore_fsocpf.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
mapiproxy/libmapistore/backends/mapistore_fsocpf.c
Simple merge