Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
This commit is contained in:
Reece H. Dunn
2013-02-11 10:35:20 +00:00
11 changed files with 327 additions and 162 deletions
+2
View File
@@ -115,6 +115,8 @@ _ე e
ჸ elifi
უ u
v _^_EN // not 'roman'
x _^_EN
% prots#enti $max3
+ pliusi $max3