Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Tue, 2 Sep 2014 07:35:59 +0000 (09:35 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Tue, 2 Sep 2014 07:35:59 +0000 (09:35 +0200)

Trivial merge