[folks/next: 20/20] Merge remote-tracking branch 'origin/master' into next

[Simon McVittie <smcv src gnome org>]

commit 9dcea4fb2ceed65451b0f0b9d9430f1f9350d0f3
Merge: a2cc576 83e7b9b
Author: Simon McVittie <simon mcvittie collabora co uk>
Date:   Wed May 7 10:52:44 2014 +0100

    Merge remote-tracking branch 'origin/master' into next

 NEWS                                               |    8 +-
 backends/bluez/bluez-persona-store.vala            |   11 +-
 backends/eds/eds-backend.vala                      |    2 +-
 backends/eds/lib/edsf-persona-store.vala           |    2 +-
 backends/eds/lib/edsf-persona.vala                 |    7 +-
 backends/telepathy/lib/tp-zeitgeist.vala           |    4 +
 .../telepathy/lib/tpf-persona-store-cache.vala     |    2 +
 backends/telepathy/lib/tpf-persona.vala            |   10 +-
 backends/tracker/lib/trf-persona.vala              |   10 +-
 configure.ac                                       |    1 +
 folks/avatar-cache.vala                            |   58 +++++++
 folks/build-conf.vapi                              |    3 +
 folks/individual-aggregator.vala                   |   18 ++-
 po/id.po                                           |  178 ++++++++++----------
 po/it.po                                           |  120 +++++++-------
 tests/bluez/vcard-parsing.vala                     |   19 ++-
 tests/dummy/individual-retrieval.vala              |    4 +-
 tests/eds/add-contacts-stress-test.vala            |    2 +
 tests/eds/enable-disable-stores.vala               |   66 ++++----
 tests/folks/avatar-cache.vala                      |   51 ++++++
 tests/lib/bluez/test-case.vala                     |    9 +
 tests/lib/dummy/test-case.vala                     |   14 ++
 tests/lib/eds/test-case.vala                       |    9 +
 tests/lib/key-file/test-case.vala                  |   15 ++
 tests/lib/libsocialweb/test-case.vala              |    9 +
 tests/lib/telepathy/test-case.vala                 |    9 +
 tests/lib/test-case.vala                           |    2 +
 tests/lib/test-utils.vala                          |   16 ++
 tests/lib/tracker/Makefile.am                      |    1 +
 tests/lib/tracker/test-case.vala                   |   12 ++-
 tests/telepathy/individual-properties.vala         |    1 +
 31 files changed, 472 insertions(+), 201 deletions(-)
---