Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 4 Feb 2013 10:19:45 +0000 (11:19 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 4 Feb 2013 10:19:45 +0000 (11:19 +0100)
commitf46bab538d8953b357098ca4ff9ace670d9b0d55
treebf6e66c8318d437f9b5a5f3efa97753e21c60fea
parent370c1135939a2e91a1611d938d2b2b9555aec0bc
parent2814ad865aafd6aa074d8a9ce658bd93331fbc1c
Merge branch 'master' of github.com:kivitendo/kivitendo-erp