Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Mon, 10 Jun 2013 13:03:04 +0000 (15:03 +0200)
committerJan Büren <jan@kivitendo-premium.de>
Mon, 10 Jun 2013 13:03:04 +0000 (15:03 +0200)

Trivial merge