Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Wed, 22 Jan 2014 11:48:49 +0000 (12:48 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Wed, 22 Jan 2014 11:48:49 +0000 (12:48 +0100)
commit738e3a611167c1b799b5257547d0e89a179dc5e1
tree631a71e1d269c80a210dc805aaeb54f2ba6cf69a
parente161c8a64cf8e4d5ab9c5779adc4acb7faee1454
parentdc262059118923b89a2af8e7990cdb5cf3b48b57
Merge branch 'master' of github.com:kivitendo/kivitendo-erp