Merge branch 'h3-gentoo-danil' into h5-ubuntu-danil
emacs: less minor mode for occur mode
emacs: impove git gutter key bindings
Merge branch 'h5-ubuntu-danil' into h3-gentoo-danil

Conflicts:
	.config/Trolltech.conf