Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 23 Jun 2011 12:12:05 +0000 (14:12 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 23 Jun 2011 12:12:05 +0000 (14:12 +0200)
commit0a612d2fe7ec14c9ed3f7d0d036e1c63d3027f4f
treefddbccdc35f43a89e6aef0ef0db0ba0ea1c5038a
parentbe3db7d1e68a317041a9556f2849c292334245ab
parent94d6b5f998a65c6d1932eb4439097b69801fbc4c
Merge branch 'master' of lx-office.linet-services.de:lx-office-erp