P. Christeas 98ab6360ed Merge branch11 into patch18 ...

Branch patch11 had somewhere been lost in bzr hell.

Conflicts:
	account/account_move_line.py
	document_webdav/nodes.py
	document_webdav/webdav_server.py
	event_project/__init__.py
	users_ldap/users_ldap.py

bzr revid: p_christ@hol.gr-20101223155444-ym8r0g4208gm88j9

2010-12-23 17:54:44 +02:00

..

__init__.py

…

document_configuration_view.xml

document: bring back the configuration wizard

2010-11-23 20:51:47 +02:00

document_configuration.py

Merge branch11 into patch18

2010-12-23 17:54:44 +02:00