[folks/wip/arbitrary-field-interface: 25/25] Merge branch 'master' into wip/arbitrary-field-interface

[Rodrigo Moya <rodrigo src gnome org>]

commit efd3e08afde1444c80378e6035cd956f654ceeaf
Merge: 60638a8 deefe3f
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Fri Jul 19 16:06:28 2013 +0200

    Merge branch 'master' into wip/arbitrary-field-interface

 Makefile.am                                    |    7 +-
 NEWS                                           |    5 +
 backends/eds/Makefile.am                       |   38 ++---
 backends/eds/lib/Makefile.am                   |   20 +--
 backends/key-file/Makefile.am                  |    6 -
 backends/libsocialweb/Makefile.am              |   27 +--
 backends/libsocialweb/lib/Makefile.am          |   53 ++----
 backends/ofono/Makefile.am                     |    5 -
 backends/telepathy/Makefile.am                 |   27 +--
 backends/telepathy/lib/Makefile.am             |  184 ++++++++++++++++---
 backends/telepathy/lib/tp-zeitgeist-dummy.vala |   50 +++++
 backends/telepathy/lib/tp-zeitgeist.vala       |  231 ++++++++++++++++++++++++
 backends/telepathy/lib/tpf-persona-store.vala  |  150 ++--------------
 backends/telepathy/lib/tpf-persona.vala        |   70 +++-----
 backends/tracker/Makefile.am                   |   33 ++---
 backends/tracker/lib/Makefile.am               |   26 +---
 configure.ac                                   |    1 +
 docs/Makefile.am                               |   44 ++---
 folks/Makefile.am                              |   20 +--
 folks/presence-details.vala                    |    3 +-
 git.mk                                         |  179 +++++++++++++++----
 tests/eds/Makefile.am                          |   10 +-
 tests/folks/Makefile.am                        |   23 ---
 tests/key-file/Makefile.am                     |   15 --
 tests/lib/Makefile.am                          |   16 +-
 tests/lib/eds/Makefile.am                      |   22 +--
 tests/lib/key-file/Makefile.am                 |   22 +--
 tests/lib/libsocialweb/Makefile.am             |   22 +--
 tests/lib/telepathy/Makefile.am                |   31 +---
 tests/lib/tracker/Makefile.am                  |   26 +--
 tests/libsocialweb/Makefile.am                 |   16 --
 tests/telepathy/Makefile.am                    |   20 --
 tests/tracker/Makefile.am                      |   69 +-------
 tools/Makefile.am                              |    5 -
 tools/inspect/Makefile.am                      |    5 -
 35 files changed, 777 insertions(+), 704 deletions(-)
---