Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
authorJan Büren <jan@lx-office-hosting.de>
Tue, 19 Apr 2011 12:10:33 +0000 (14:10 +0200)
committerJan Büren <jan@lx-office-hosting.de>
Tue, 19 Apr 2011 12:10:33 +0000 (14:10 +0200)
commit7f34b3c1f69619eaf3c41945ab22cf21883bb945
treed29c7de0b365c1ad894cfb4a3280528dd1e1f5cf
parent988bf83fd95fcea3bc999eb8761694459336676a
parent3504ddf3cfbdf3dce98f72d7d5b3c5757cd2f58a
Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp