]> git.tue.mpg.de Git - paraslash.git/commitdiff
Merge branch 'in_mem_user_list'
authorAndre <maan@meins.(none)>
Thu, 16 Nov 2006 18:43:29 +0000 (19:43 +0100)
committerAndre <maan@meins.(none)>
Thu, 16 Nov 2006 18:43:29 +0000 (19:43 +0100)

Trivial merge