From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 30 Dec 2010 15:34:50 +0000 (+0100)
Subject: Merge branch 'controller'
X-Git-Tag: release-2.6.2beta1~17^2~3
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=bcadf16a799e73371e23489de2ea099ee59340e8;p=kivitendo-erp.git

Merge branch 'controller'
---

bcadf16a799e73371e23489de2ea099ee59340e8