core: merge branch 'th/waitpid-bgo748885'
authorThomas Haller <thaller@redhat.com>
Tue, 5 May 2015 14:39:27 +0000 (16:39 +0200)
committerThomas Haller <thaller@redhat.com>
Tue, 5 May 2015 14:39:27 +0000 (16:39 +0200)
https://bugzilla.gnome.org/show_bug.cgi?id=748885


Trivial merge