Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 17 Jun 2013 15:31:31 +0000 (17:31 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 17 Jun 2013 15:31:31 +0000 (17:31 +0200)

Trivial merge