Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorPeter Schulgin <peter.schulgin@opendynamic.de>
Mon, 6 Jan 2014 10:34:52 +0000 (11:34 +0100)
committerPeter Schulgin <peter.schulgin@opendynamic.de>
Mon, 6 Jan 2014 10:34:52 +0000 (11:34 +0100)

Trivial merge