Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Tue, 10 Dec 2013 10:07:54 +0000 (11:07 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Tue, 10 Dec 2013 10:07:54 +0000 (11:07 +0100)
commit0f0cb3b708f9078b774a07cecd996e5bdc5fac63
treeb26dd24e371d27e0a8a8434ffe94cf7fc2925536
parentc6be179d8db02c2704dd9d59005297837f19b37a
parent96ca0b88b082cc24081889bcfc63cb2808049f68
Merge branch 'master' of github.com:kivitendo/kivitendo-erp