Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorNiclas Zimmermann <niclas@kivitendo-premium.de>
Thu, 13 Jun 2013 10:02:51 +0000 (12:02 +0200)
committerNiclas Zimmermann <niclas@kivitendo-premium.de>
Thu, 13 Jun 2013 10:02:51 +0000 (12:02 +0200)

Trivial merge