Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 20 Jun 2011 15:54:35 +0000 (17:54 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 20 Jun 2011 15:54:35 +0000 (17:54 +0200)
commitd74347f965b920e837d28ae0d7c78135a2f447a3
tree2f473f7a48cb9dbf1ddd250990a81d20d0d67f19
parent75f692499bd11b7e2cd6fa4acb5c29923d0e281b
parent8d7c95292d90dea5201c90c0da319f81ab8eb1c2
Merge branch 'master' of lx-office.linet-services.de:lx-office-erp