commit eeaa6dcdb342063bb6d3a7ed2e5003d772552f43
author Lucas De Marchi <lucas.de.marchi@gmail.com> Sat Oct 15 10:05:12 2011 -0300
committer Lucas De Marchi <lucas.de.marchi@gmail.com> Sat Oct 15 10:05:12 2011 -0300
tree 5c36a8f4c6b27f70497011ac7aa4ef38c97e3779
parent be9d1ace364d29c528c83e48f0a861aa272c8368
parent 2329b456f5b07b8a6ee888288ff3d201718a739c

Merge branch 'dict' into v1.2.x

data/dictionary.txt

diff --git a/data/dictionary.txt b/data/dictionary.txt
index e661c35..5b2c793 100644
--- a/data/dictionary.txt
+++ b/data/dictionary.txt
@@ -2295,7 +2295,7 @@
 maneouvres->manoeuvres
 maneouvring->manoeuvring
 manisfestations->manifestations
-mannor->manner
+mannor->manner, manor,
 manoeuverability->maneuverability
 manouver->maneuver, manoeuvre,
 manouverability->maneuverability, manoeuvrability, manoeuverability,
@@ -3544,6 +3544,7 @@
 soverign->sovereign
 soverignity->sovereignty
 soverignty->sovereignty
+spagetti->spaghetti
 spainish->Spanish
 speach->speech
 specfic->specific