Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Mon, 20 Jan 2014 14:03:16 +0000 (15:03 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Mon, 20 Jan 2014 14:03:16 +0000 (15:03 +0100)

Trivial merge