Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Thu, 18 Jul 2013 07:09:41 +0000 (09:09 +0200)
committerJan Büren <jan@kivitendo-premium.de>
Thu, 18 Jul 2013 07:09:41 +0000 (09:09 +0200)

Trivial merge