[gnome-software/wip/rancell/ubuntu-ratings-3-18: 19/19] Merge branch 'gnome-3-18' into ubuntu-ratings-3-18

[Robert Ancell <rancell src gnome org>]

commit 7e8e5fc3e5cd90ce09bfaca4eb4db391c568dd66
Merge: e8b6e4f 7cc4017
Author: Robert Ancell <robert ancell canonical com>
Date:   Fri Dec 11 15:32:39 2015 +1300

    Merge branch 'gnome-3-18' into ubuntu-ratings-3-18

 data/appdata/org.gnome.Software.appdata.xml.in |    7 +
 po/de.po                                       |    6 +-
 po/sr.po                                       |  279 +++++++++++-------------
 src/gs-application.c                           |    1 -
 src/plugins/gs-plugin-fedora-tagger-ratings.c  |    6 +-
 src/plugins/gs-plugin-local-ratings.c          |    4 +-
 tests/actions.py                               |    2 +-
 tests/basic.py                                 |    2 +-
 8 files changed, 146 insertions(+), 161 deletions(-)
---