Merge branch 'feature/follow_all_parents_option'
Merge branch 'feature/generate_unreleased_version_string'

Conflicts:
	gitchangelog.py
	gitchangelog.rc.reference