Revision 72ce3463
| ID | 72ce3463a2a585b0db58fa96a7c5d50562c1d8e9 |
Merge branch 'devel-2.4' into devel-2.5
Conflicts:
NEWS (trivial)
configure.ac (trivial)
daemons/ensure-dirs.in (deleted)
Signed-off-by: René Nussbaumer <rn@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
Files
- added
- modified
- copied
- renamed
- deleted