From: Niclas Zimmermann <niclas@kivitendo-premium.de>
Date: Mon, 6 Jan 2014 17:59:33 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~22^2~40^2~1^2~2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/56911d6832f011555add955dc905e6e72ac2db65?ds=inline;hp=--cc

Merge branch 'master' of https://github.com/kivitendo/kivitendo-erp
---

56911d6832f011555add955dc905e6e72ac2db65