Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Tue, 24 Apr 2012 09:45:28 +0000 (11:45 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Tue, 24 Apr 2012 09:45:28 +0000 (11:45 +0200)
1  2 
citadel/user_ops.c

Simple merge