Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorBernd Bleßmann <bernd@kivitendo-premium.de>
Tue, 7 Jan 2014 15:11:53 +0000 (16:11 +0100)
committerBernd Bleßmann <bernd@kivitendo-premium.de>
Tue, 7 Jan 2014 15:11:53 +0000 (16:11 +0100)
commit1e542cc70c846448b75be1f36becd61601a4b3d3
tree4272fe0374508d0bc23c1776bc0a4bc46342e8d1
parentee561795f028a6298d47b3d1df8597c1e088151f
parentaf039f53d1b4d8e8456f88fcf3b2bfdc22f8889a
Merge branch 'master' of github.com:kivitendo/kivitendo-erp