[five-or-more/vala-port: 6/6] Merge branch 'master' into vala-port

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 6332a64d76e3457484d1c067037c18e4435f952c
Merge: 1bce75b e1f338b
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Fri Dec 6 18:25:48 2013 -0600

    Merge branch 'master' into vala-port
    
    Conflicts:
        src/glines.c

 data/five-or-more.appdata.xml.in |    2 +-
 help/el/el.po                    |  651 +++++++++++++++++++++++---------------
 po/es.po                         |   12 +-
 3 files changed, 406 insertions(+), 259 deletions(-)
---