Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorBernd Bleßmann <bernd@kivitendo-premium.de>
Thu, 22 Jan 2015 14:27:29 +0000 (15:27 +0100)
committerBernd Bleßmann <bernd@kivitendo-premium.de>
Thu, 22 Jan 2015 14:27:29 +0000 (15:27 +0100)
commit9a076af6876160ab2a9d86692f64d61d5ee9003c
tree87644e173c3f14cf7fda5c4323d953f7a65f8454
parent1c914c85a57b267f2e4967ddac7e7bd359d0c820
parentf087c3736d8c707c18cb3ea87692995940361057
Merge branch 'master' of github.com:kivitendo/kivitendo-erp