Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Wed, 29 Jan 2014 16:48:19 +0000 (17:48 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Wed, 29 Jan 2014 16:48:19 +0000 (17:48 +0100)
commitcafe1b4f14d15c3bdf36bba97b4cba487e9b0e5d
tree18e0d1ddb043fa18969a8d5ad5293e201ef56955
parentdb3354aeb93819b7b4701fb351b5ee9f66fcfe88
parent5012e90c3dcec9566b23ee93f71bf78a30c9f35d
Merge branch 'master' of github.com:kivitendo/kivitendo-erp