Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Mon, 20 Jan 2014 14:03:16 +0000 (15:03 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Mon, 20 Jan 2014 14:03:16 +0000 (15:03 +0100)
commit434d7c13b2618f29235e8f7adc93001ae5552915
tree67958f983f75ce905c4f6aa1d01fb0c1a5222c97
parente0c529a490b9b69559862166e63f0807c82f1b49
parentccb40ac450d3094ebc5b544e75ccacdc27f47aee
Merge branch 'master' of github.com:kivitendo/kivitendo-erp