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

Merge branch 'flash'
---

bda0d70b98bd9c9afc5ef8ae83a58497989d6750