keyfile: merge branch 'th/keyfile-path-bgo755995'
authorThomas Haller <thaller@redhat.com>
Wed, 14 Oct 2015 18:23:54 +0000 (20:23 +0200)
committerThomas Haller <thaller@redhat.com>
Wed, 14 Oct 2015 18:23:54 +0000 (20:23 +0200)
commitc3ccc9975e7b1e4b920b5be101410763074d7f98
treeb39232be02175b601c31e70d10a95227d2f1f1bf
parent7209356c4f47367d6e42e0cc8f2c10a816781cf3
parent2144457fab9138c9f5ddac9759f48e2a8735dcfb
keyfile: merge branch 'th/keyfile-path-bgo755995'

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