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)
commitfdef81207f7158a9acbdf900c05367bb960e6533
treec6a5b9c978f02cf24f21f92c629d32aafdb00f78
parent1a9f6bcbd3d262ba60264afa2f0658150ce10e59
parent0fe0e62d686774438fc83ad66f7bf40a1412a359
Merge branch 'th/bgo696936_normalize_settings'

https://bugzilla.gnome.org/show_bug.cgi?id=696936

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