Merge branch '1831_disable_nls'
commit15bfe2f86b0482e25a926242a703e9864d3a1e6d
authorAndrew Borodin <aborodin@vmail.ru>
Fri, 20 Nov 2009 11:40:39 +0000 (20 14:40 +0300)
committerAndrew Borodin <aborodin@vmail.ru>
Fri, 20 Nov 2009 11:40:39 +0000 (20 14:40 +0300)
treeaa03cb663799552482f5a7bcc1aed2cc04946686
parent0b8b237d2b17c3a3b274f070b26849165e86db41
parenta193e2e56f3d899d907d574f861949415129bee1
Merge branch '1831_disable_nls'

* 1831_disable_nls:
  Ticket #1831: fixed compilation warings of --disable-nls and --disable-charset options.