proper history line
Revert "proper history line"

This reverts commit d9292bd2529ff11ae69f064979c2defad3c55f1b.
Merge branch 'master' into foodcoop-adam-beta