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