More clobbering

Signed-off-by: Andrew Shewchenko <andrews@nulogy.com>
Merge branch 'master' of git@github.com:clemensp/majordomo.git