* commit '7763118c':
  log: Support for 256color terminals

Conflicts:
	doc/APIchanges
	libavutil/log.c
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>