Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Thu, 30 Jan 2014 14:09:17 +0000 (15:09 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Thu, 30 Jan 2014 14:09:17 +0000 (15:09 +0100)
commit8315221e21e3560978855576856c02ee56695d35
treee0fe17bb9dce25597a058957c20242e529433093
parentd63ea7c6b814244c99eb40d56633a96debf93a3f
parent6b5e657a5cef0fe78cc00d27940e4b6a65bd30b0
Merge branch 'master' of github.com:kivitendo/kivitendo-erp