Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Fri, 22 Jul 2011 10:57:28 +0000 (12:57 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Fri, 22 Jul 2011 10:57:28 +0000 (12:57 +0200)
commit5aaa3c621371557ed9fde80ef6a07e2b7959c0cb
treec110cd4059ef2b4abb80e2467905bb3169c29f47
parent424d6eadbe8a0c863a4f6a4ea5e60a86a309de50
parent306fad809f1e36204c095faaf1c179d24aeb60e1
Merge branch 'master' of lx-office.linet-services.de:lx-office-erp