Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Fri, 5 Mar 2010 10:29:02 +0000 (11:29 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Fri, 5 Mar 2010 10:29:02 +0000 (11:29 +0100)
1  2 
doc/changelog

diff --cc doc/changelog
Simple merge