]> www.infradead.org Git - users/dwmw2/ews-sync.git/commit
Merge branch 'master' of ssh://git.infradead.org/home/dwmw2/public_git/ews-sync
authorDavid Woodhouse <dwmw2@infradead.org>
Wed, 21 Jul 2010 12:30:08 +0000 (13:30 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Wed, 21 Jul 2010 12:39:13 +0000 (13:39 +0100)
commit7027ecfcf6276867b0e607c9e99cb3dffa1e1d0d
tree87c99112fe3fe4d3bbb5dbf22c2f830bc2ed2c07
parentf388e5f0b159b8938e255be8562a795a2540243b
parent38209390adbd5c80a4ed4f7b852ae08dcab80abc
Merge branch 'master' of ssh://git.infradead.org/home/dwmw2/public_git/ews-sync

Conflicts:
ews_syncfolder.c
ews_syncfolder.c