Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Fri, 13 Dec 2013 13:00:45 +0000 (14:00 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Fri, 13 Dec 2013 13:00:45 +0000 (14:00 +0100)
commit19064edf6bd7859e831fdf37cd465f7f933be6f3
tree44917fc764f40ef1981bd2be5785c4bf6174ee6a
parentd8e323bbf44a0759359d1b727ce6335e7423b22f
parent47900a4deea70bc70dedcaadefa77061e350878c
Merge branch 'master' of github.com:kivitendo/kivitendo-erp