Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Tue, 7 Jan 2014 09:26:04 +0000 (10:26 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Tue, 7 Jan 2014 09:26:04 +0000 (10:26 +0100)
commit13b7b660f564981597f58ba4e6d0b4cc5b7c6d1a
tree9d3179da37fd32c22a10de5fedefb6b515de478e
parent22322dc1849de5516d3b577a86221e6849877ae9
parent312edcf844dc5f76d57c3a3d4e57701d7ba3c747
Merge branch 'master' of github.com:kivitendo/kivitendo-erp