2 Commits

Author	SHA1	Message	Date
Regis Houssin	ead2a81baf	Fix: merge problem	2012-08-23 18:45:41 +02:00
Regis Houssin	56a22d2b59	Fix: rename for security raison	2012-08-23 18:15:54 +02:00