Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Mon, 3 Mar 2014 10:17:58 +0000 (11:17 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Mon, 3 Mar 2014 10:17:58 +0000 (11:17 +0100)

Trivial merge