Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 29 Apr 2013 11:16:48 +0000 (13:16 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 29 Apr 2013 11:16:48 +0000 (13:16 +0200)

Trivial merge