Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 4 Mar 2010 13:19:28 +0000 (14:19 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 4 Mar 2010 13:19:28 +0000 (14:19 +0100)
commitf11dcc70cd323fe2071ea62b53fc0ec106c3c02d
tree41ec6c96bf1e46751ba2a662c9ee20f603083985
parent223e79e4ca11515da2f65f94ec398594c7d446c5
parentf42b8272a31219ff145eafb007874b520c1fc3eb
Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp

Conflicts:
doc/changelog
doc/changelog