Merge branch 'master' of ssh://lx-office/~/lx-office-erp
authorSven Schöling <s.schoeling@linet-services.de>
Fri, 5 Mar 2010 11:17:32 +0000 (12:17 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Fri, 5 Mar 2010 11:17:32 +0000 (12:17 +0100)
1  2 
doc/changelog
locale/de/all

diff --cc doc/changelog
Simple merge
diff --cc locale/de/all
Simple merge