merge branch 'th/kill_child'
authorThomas Haller <thaller@redhat.com>
Thu, 10 Jul 2014 14:33:37 +0000 (16:33 +0200)
committerThomas Haller <thaller@redhat.com>
Thu, 10 Jul 2014 14:33:45 +0000 (16:33 +0200)
commit397762c2c7211dc804d8ba7e2f1c7be8247aa0d0
tree05a64173177e942a4ddc004a89b9268c103c6e1f
parent734203e12ed99c586aa36a2eef5858c80c580e61
parentff3b7538578454bd8cd9a0800588631b3f6a609e
merge branch 'th/kill_child'

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

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