From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Wed, 31 Oct 2012 15:14:19 +0000 (+0100)
Subject: Merge remote-tracking branch 'refs/remotes/origin/master'
X-Git-Tag: release-3.0.0beta1~65
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=d00e1b28dc8b03abfebf5c7be9305f01dc968ebc;p=kivitendo-erp.git

Merge remote-tracking branch 'refs/remotes/origin/master'
---

d00e1b28dc8b03abfebf5c7be9305f01dc968ebc