Merge basic support for alternates.
authorJelmer Vernooij <jelmer@samba.org>
Sun, 4 Sep 2011 23:27:13 +0000 (01:27 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 4 Sep 2011 23:27:13 +0000 (01:27 +0200)
1  2 
NEWS

diff --cc NEWS
Simple merge