Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Fri, 26 Jun 2015 09:36:45 +0000 (11:36 +0200)
committerJan Büren <jan@kivitendo-premium.de>
Fri, 26 Jun 2015 09:36:45 +0000 (11:36 +0200)
commit9985655a1d5ae8577901aec2f5052e1d357c52a3
treeabdad5c62e6beb225d4e306bc8051e2dac4b5f50
parentc51481ebe9349c170bfd750a0b7d46ee54e9e0c4
parentb8b6cdf3aa11e1dd23b55493f9357585e2b06547
Merge branch 'master' of github.com:kivitendo/kivitendo-erp