Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Mon, 29 Jun 2015 09:14:23 +0000 (11:14 +0200)
committerJan Büren <jan@kivitendo-premium.de>
Mon, 29 Jun 2015 09:14:23 +0000 (11:14 +0200)
commit2647d6943850866ac437660e0a16ea965c01c22b
tree18c13d01c71cc589bbf2b0166e8d89ff49a6107c
parent9985655a1d5ae8577901aec2f5052e1d357c52a3
parent5f0565fca3529ac662c5025243bc7bedf8c54328
Merge branch 'master' of github.com:kivitendo/kivitendo-erp