Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Mon, 13 Apr 2015 15:51:38 +0000 (17:51 +0200)
committerJan Büren <jan@kivitendo-premium.de>
Mon, 13 Apr 2015 15:51:38 +0000 (17:51 +0200)
commit9052a0482c67ea9ac1f862f3474c93e683ccae68
tree7fc8c7fc66e29450d255d218d446b2054c0671ec
parent375f824f70509fa537c4342c4a0d14204f35e767
parent875e89eead12c05070371918fae97335cf451c0c
Merge branch 'master' of github.com:kivitendo/kivitendo-erp