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)
1  2 
daemon.c
user_list.c

diff --cc daemon.c
Simple merge
diff --cc user_list.c
Simple merge