Skip to content
Snippets Groups Projects
Commit 72ce3463 authored by René Nussbaumer's avatar René Nussbaumer
Browse files

Merge branch 'devel-2.4' into devel-2.5 


Conflicts:
	NEWS (trivial)
	configure.ac (trivial)
	daemons/ensure-dirs.in (deleted)

Signed-off-by: default avatarRené Nussbaumer <rn@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parents b972c223 e4a48c7b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment