Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorJan Büren <jan@kivitendo-premium.de>
Wed, 7 Nov 2012 10:58:16 +0000 (11:58 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Wed, 7 Nov 2012 10:58:16 +0000 (11:58 +0100)
commit9d218dc8b07ff4f9be9589cb3246e50653e2b6e2
tree40b54698a8c85a40e185bcdc1a01a36ea08cc55f
parent075bd42af8885aee3c18fe055a2c82b8b43f4cea
parentd8b2ca906d06c4a9d7bdaec1ccefe5d201a630cc
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp