Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
authorJan Büren <jan@lx-office-hosting.de>
Wed, 25 May 2011 05:12:08 +0000 (07:12 +0200)
committerJan Büren <jan@lx-office-hosting.de>
Wed, 25 May 2011 05:12:08 +0000 (07:12 +0200)
1  2 
doc/changelog

diff --cc doc/changelog
Simple merge