Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 23 Jan 2014 09:52:30 +0000 (10:52 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 23 Jan 2014 09:52:30 +0000 (10:52 +0100)

Trivial merge