# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1223483240 -3600
# Node ID a1f4f3c5ae251e468c023168af97f857f69e20da
# Parent  7346ef3e80acd8da26bcf3275d9f20a23b64af35# Parent  523ac742cc19d696e38b054c8c4c43863673bd14
Merge roster fixes from waqas

diff -r 523ac742cc19 -r a1f4f3c5ae25 doc/lxmppd_core_stanz_dispatch.txt
--- a/doc/lxmppd_core_stanz_dispatch.txt	Wed Oct 08 21:10:18 2008 +0500
+++ b/doc/lxmppd_core_stanz_dispatch.txt	Wed Oct 08 17:27:20 2008 +0100
@@ -24,3 +24,4 @@
 	
 	function (stanza)
 		Validates the stanza and calls the required handler
+
diff -r 523ac742cc19 -r a1f4f3c5ae25 doc/names.txt
--- a/doc/names.txt	Wed Oct 08 21:10:18 2008 +0500
+++ b/doc/names.txt	Wed Oct 08 17:27:20 2008 +0100
@@ -1,9 +1,35 @@
-lxmppd	 -	...
-dia	 -	Greek, 'through', pronounced "dee-ah", root of "dialogue"
-metaphor -  	An imaginative comparison between two actions/objects etc which is not literally applicable.
-minstrel -  	Itinerant medieval musician/singer/story teller/poet. 
-parody	 -	Imitation of a poem or another poet's style for comic/satiric effect.
-poesy	 -	Archaic word for poetry.
-Xinshi   -	Chinese poetic term which literally means 'new poetry'.
+lxmppd	 	-	...
+dia		 	-	Greek, 'through', pronounced "dee-ah", root of "dialogue"
+metaphor	-	An imaginative comparison between two actions/objects etc which is not literally applicable.
+minstrel	-	Itinerant medieval musician/singer/story teller/poet.
+parody		-	Imitation of a poem or another poet's style for comic/satiric effect.
+poesy		-	Archaic word for poetry.
+Xinshi		-	Chinese poetic term which literally means 'new poetry'.
+polylogue	-	Many conversations
 
-polylogue-	Many conversations
+Thorns thought of:
+	poe		-	Derived from "poetry"
+	poezie	-	Romanian for "poesy" and "poem"
+	Elain	-	Just a cool name
+	Elane	-	A variation
+	Eclaire	-	Idem (French)
+	Adel	-	Random
+	Younha	-	Read as "yuna"
+	Quezacotl	-	Mayan gods -> google for correct form and pronounciation
+	Carbuncle	-	FF8 Guardian Force ^^
+	Protos	-	Mars satellite
+	mins	-	Derived from minstrel
+	diapoe	-	gr. dia + poesy/poetry
+	xinshi	-	I like it for a name just like that
+	loom	-	The first application I run on the first day of using a computer
+	Lory	-	Another name I happen to like
+	Loki	-	Nordic god of mischief, IIRC
+	Luna	-	Probably taken but I think worth mentioning
+	Coreo	-	Random thought
+	Miria	-	Also random
+	Lora	-	Idem
+	Kraken	-	:P
+	Nebula	-	.
+	
+	
+	
diff -r 523ac742cc19 -r a1f4f3c5ae25 net/server.lua
--- a/net/server.lua	Wed Oct 08 21:10:18 2008 +0500
+++ b/net/server.lua	Wed Oct 08 17:27:20 2008 +0100
@@ -39,7 +39,6 @@
 local coroutine_yield = coroutine.yield
 local print = print;
 local out_put = function () end --print;
-local out_put = print;
 local out_error = print;
 
 --// extern libs //--
diff -r 523ac742cc19 -r a1f4f3c5ae25 pull_from_master.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pull_from_master.sh	Wed Oct 08 17:27:20 2008 +0100
@@ -0,0 +1,4 @@
+#!/bin/sh
+echo "Pulling from http://getjabber.ath.cx:4000/"
+echo "You must have Mercurial (the hg command)"
+hg pull http://getjabber.ath.cx:4000/