Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
authorJan Büren <jan@lx-office-hosting.de>
Fri, 13 May 2011 10:57:14 +0000 (12:57 +0200)
committerJan Büren <jan@lx-office-hosting.de>
Fri, 13 May 2011 10:57:14 +0000 (12:57 +0200)
commit9434c14ab2cb7d10cbe20276d08771c43f9fffc1
treeee63957d9879470a604b2bb0839d62d24a48a8ac
parentc6d1bb55635333f190afa2daed451761352873e1
parente1e923e54c6fa47eca6b1af30d6c9c1283530543
Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp

Conflicts:

doc/changelog
doc/changelog