Merge commit 'upstream/2.3.1+dfsg' into bug/unlink-pidfile
authorFerenc Wagner <wferi@niif.hu>
Tue, 1 Feb 2011 15:31:24 +0000 (16:31 +0100)
committerFerenc Wagner <wferi@niif.hu>
Tue, 1 Feb 2011 15:31:24 +0000 (16:31 +0100)
commitb4c0bfc65ae74a6d051357c3e0a179fe662bb4f0
treee8b6e3b4f056390f828f144b695978729acf028e
parente3f9f2783f95a4c5505455d9022d994efd18a97a
parentfb303a3a93c0edc6dffa170e5d7440289532140e
Merge commit 'upstream/2.3.1+dfsg' into bug/unlink-pidfile