Merge branch 't/server_optional'
authorAndre Noll <maan@systemlinux.org>
Sun, 14 Nov 2010 14:32:45 +0000 (15:32 +0100)
committerAndre Noll <maan@systemlinux.org>
Sun, 14 Nov 2010 14:32:45 +0000 (15:32 +0100)
commite9db2928d524cca83bf44252c75286a905cef779
tree918bca7f9f96a3e71c8edcb64a0e084ba9f49c00
parent3067991db050ae8b329474892ba0b75296f7382b
parent025d005189ecdbe8b64e4594024dddaace160f36
Merge branch 't/server_optional'