Merge branch 'th/bgo696936_normalize_settings'
authorThomas Haller <thaller@redhat.com>
Fri, 22 Aug 2014 13:30:40 +0000 (15:30 +0200)
committerThomas Haller <thaller@redhat.com>
Fri, 22 Aug 2014 13:30:50 +0000 (15:30 +0200)
https://bugzilla.gnome.org/show_bug.cgi?id=696936

Signed-off-by: Thomas Haller <thaller@redhat.com>

Trivial merge