Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorNiclas Zimmermann <niclas@kivitendo-premium.de>
Fri, 9 Nov 2012 12:00:59 +0000 (13:00 +0100)
committerNiclas Zimmermann <niclas@kivitendo-premium.de>
Fri, 9 Nov 2012 12:00:59 +0000 (13:00 +0100)
commit25c3ca0d2e6360fcb3cc56f3c26c2dd4bcce3af9
treeeee1ed7f0902b5e478dd44f65d9e5eea8ce568de
parent155f106a7d0b0bbd3c5e1d1aa5989bd08883e626
parentbf9a0eab96511f9db2ebe2c8791cd19f6db2177f
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp