Merge commit 'origin/data-encoding'
authorJohn Darrington <john@darrington.wattle.id.au>
Sat, 18 Jul 2009 11:20:38 +0000 (13:20 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Sat, 18 Jul 2009 11:20:38 +0000 (13:20 +0200)
Conflicts:

src/language/dictionary/split-file.c


No differences found