Merge branch 'maint'
authorAndre Noll <maan@systemlinux.org>
Thu, 22 Oct 2009 20:51:09 +0000 (22:51 +0200)
committerAndre Noll <maan@systemlinux.org>
Thu, 22 Oct 2009 20:51:09 +0000 (22:51 +0200)
commit11e68b8de3eb8bf8b657333d5b8359260559e93b
tree6f0b1bdc78c6102063648b1c274dfbac65c463ed
parentd5d96c6c65b47a34136bc04420bffd38e947bfea
parentc630fae7b18ec399c45305737f10ab47733dc63e
Merge branch 'maint'
daemon.c
user_list.c