Imported Upstream version 0.099+git20140120-1
Imported Upstream version 0.099+git20140120
Merge tag 'upstream/0.099+git20140120'

Upstream version 0.099+git20140120 repacked.

Conflicts:
	.gitignore
	config.h.in
	configure
	configure.ac

Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>