K 10
svn:author
V 7
thierry
K 8
svn:date
V 27
2012-06-12T20:48:15.000000Z
K 7
svn:log
V 131
Update CONFLICTS (1).

Since I'm there, define the license.

Submitted by:	"Sulev-Madis 'ketas' Silber" <madis555 (at) hot.ee> (1)

END
