[gnome-initial-setup/shell/4765: 272/362] Merge branch 'master' into eos2

[Jasper St. Pierre <jstpierre src gnome org>]

commit fc26107fd3a5959959ed1ab382d2ac6e08f252b8
Merge: b444bae a7c9491
Author: Roddy Shuler <roddy endlessm com>
Date:   Wed Oct 22 16:45:25 2014 -0700

    Merge branch 'master' into eos2

 po/ar.po |    6 +++---
 po/es.po |    7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)
---