[evolution-data-server/openismus-phonenumber-work: 5/5] Merge branch 'openismus-work' into openismus-phonenumber-work

[Mathias Hasselmann <hasselmm src gnome org>]

commit 61b5d9dcbae09132101320d40c0090a6b9d8a5a4
Merge: 9aaf5e7 0007cc0
Author: Mathias Hasselmann <mathias openismus com>
Date:   Fri Dec 7 12:54:32 2012 +0100

    Merge branch 'openismus-work' into openismus-phonenumber-work

 addressbook/backends/file/e-book-backend-file.c    |    5 +++-
 .../libebook-contacts/e-book-contacts-types.h      |    3 +-
 libedataserver/e-client.h                          |    3 +-
 tests/libebook/client/client-test-utils.c          |    5 ++++
 tests/libebook/client/test-client-custom-summary.c |   22 ++++++++++++++++++-
 tests/libebook/client/test-client-write-write.c    |    4 +-
 6 files changed, 34 insertions(+), 8 deletions(-)
---