Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
This commit is contained in:
Reece H. Dunn
2013-06-13 14:46:46 +01:00
20 changed files with 4463 additions and 3244 deletions
+1
View File
@@ -163,6 +163,7 @@
u (A w
A) u (K w
C) ue (C u: // German names
j) u (čeno 'u:
.group v