[evolution-data-server/openismus-work: 2/2] Merge remote-tracking branch 'origin/gnome-3-6' into openismus-work

[Patrick Ohly <pohly src gnome org>]

commit d5031677c4deb4eb13a777d6174a90ec1de44e12
Merge: 9713ae1 319d8d9
Author: SyncEvolution Nightly Testing <syncevolution syncevolution org>
Date:   Sat May 18 18:47:49 2013 +0000

    Merge remote-tracking branch 'origin/gnome-3-6' into openismus-work
    
    Conflicts:
        libedataserver/e-gdbus-templates.c
    
    Conflicts were due to earlier merge and revert attempts. Now libedataserver/e-gdbus-templates.c
    is the same as in gnome-3-6.

 libedataserver/e-gdbus-templates.c |  123 ++++++++++++++++++++++++++++++++----
 1 files changed, 110 insertions(+), 13 deletions(-)
---