s4:lib/util/charset/iconv.c - remove a distinction which can never happen
[abartlet/samba.git/.git] / merged-branches.txt
2008-09-14 Stefan MetzmacherMerge Samba3 and Samba4 together
2008-09-11 Stefan Metzmacherprepare merging Samba3 and Samba4 together.