Merge branch 'upstream' into bug/unlink-pidfile
authorRuss Allbery <rra@debian.org>
Thu, 7 Apr 2011 00:57:04 +0000 (17:57 -0700)
committerRuss Allbery <rra@debian.org>
Thu, 7 Apr 2011 00:57:04 +0000 (17:57 -0700)
commitf5b6e96cf5f36686e8fd7c3959e4889de2e9f432
tree49374a429883c32dae9e036f96d40f0acd35dc09
parentb4c0bfc65ae74a6d051357c3e0a179fe662bb4f0
parentdcdaebee3864e1659f5589ed3ad8ceed1e014de0
Merge branch 'upstream' into bug/unlink-pidfile