Merge branch 'master' of ssh://git-sdonath@lx-office.linet-services.de/~/lx-office...
authorSven Donath <lxo@dexo.de>
Thu, 30 Sep 2010 15:04:46 +0000 (17:04 +0200)
committerSven Donath <lxo@dexo.de>
Thu, 30 Sep 2010 15:04:46 +0000 (17:04 +0200)
commitee1d7e16868223bdeb2be45555b4d15545b53c7c
treedb24a2c78884e80b0b682c92aa6437dcc4cd0a86
parent0ea0e97f0042a084acf5f28654a21921a9f7e777
parent47d41892bf92e3442b35985ad860e613936e28b3
Merge branch 'master' of ssh://git-sdonath@lx-office.linet-services.de/~/lx-office-erp into printer_admin