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 12:52:44 +0000 (14:52 +0200)
committerJan Büren <jan@lx-office-hosting.de>
Fri, 13 May 2011 12:52:44 +0000 (14:52 +0200)
commit9bb32c2257f2eaaf500c9b45e395a60ade1b37f3
tree0cab5c20cc17df4d0268101ee2054872ed82fabc
parentf734534304287c27d97e58bc37009f1f17205c55
parentdd0ba7b9a6f931ce13ced906d9cc6cb3e7c3ea3a
Merge branch 'master' of git://lx-office.linet-services.de/lx-office-erp