Merge branch 'platal-0.10.0'

author Vincent Zanotti <vincent.zanotti@m4x.org>

Sat, 16 May 2009 21:34:08 +0000 (23:34 +0200)

committer Vincent Zanotti <vincent.zanotti@m4x.org>

Sat, 16 May 2009 21:34:08 +0000 (23:34 +0200)
author Vincent Zanotti <vincent.zanotti@m4x.org>
Sat, 16 May 2009 21:34:08 +0000 (23:34 +0200)
committer Vincent Zanotti <vincent.zanotti@m4x.org>
Sat, 16 May 2009 21:34:08 +0000 (23:34 +0200)
diff --cc classes/xorgsession.php
Simple merge
diff --cc include/emails.inc.php
Simple merge
author	Vincent Zanotti <vincent.zanotti@m4x.org>
	Sat, 16 May 2009 21:34:08 +0000 (23:34 +0200)
committer	Vincent Zanotti <vincent.zanotti@m4x.org>
	Sat, 16 May 2009 21:34:08 +0000 (23:34 +0200)
		1	2
classes/xorgsession.php	patch \|	diff1 \|	diff2 \|	blob \| history
include/emails.inc.php	patch \|	diff1 \|	diff2 \|	blob \| history