Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Thu, 22 Jan 2015 15:08:03 +0000 (16:08 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Thu, 22 Jan 2015 15:08:03 +0000 (16:08 +0100)
commit0b4b1f4c8a098531b11da00d2162ffaef4933a7f
treeae5121d3df7e2ea0c9cd4ab2282779d74e306d40
parentcc6ef1b946d0d9f7333225d7ed0a6f1aeb60c374
parentde7609414010f5dfa6c47091633a6319d0106c48
Merge branch 'master' of github.com:kivitendo/kivitendo-erp