From: Jan Büren <jan@kivitendo-premium.de>
Date: Wed, 29 Jan 2014 12:26:40 +0000 (+0100)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~15
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/commitdiff_plain/094307a8ce3e7680a5b14ef17b5c1094a2555009

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

094307a8ce3e7680a5b14ef17b5c1094a2555009