Merge remote-tracking branch 'origin/trellis-old' into trellis
[util-vserver.git] / AUTHORS
1 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
2 Daniel Hokka Zakrisson <daniel@hozac.com>