« Previous | Next » 

Revision 106ee697

Parent aff49a15, 07c7c94a
Child 43c16a8a, 2803b47d

Added by Iustin Pop over 11 years ago

Merge branch 'devel-2.6' into stable-2.6

It seems Michael submitted the daemon-util patch on devel-2.6, and I
didn't realise it. It's way too early in the release cycle of 2.6 to
have diverging branches, so I'm merging devel-2.6 into stable-2.6 and
then will ff the devel branch to the merge point.

  • origin/devel-2.6:
    Add support to daemon-util for distributions without start-stop-daemon

Signed-off-by: Iustin Pop <>
Reviewed-by: René Nussbaumer <>


  • added
  • modified
  • copied
  • renamed
  • deleted