Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 16 Jan 2014 14:37:53 +0000 (15:37 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 16 Jan 2014 14:37:53 +0000 (15:37 +0100)

Trivial merge