commit inicial
nothing to say
Merge branch 'master' of /home/joao/programação/codigo-fonte/cliaspora/cliaspora-0.1.8

Conflicts:
	Makefile
	cliaspora.1
	cliaspora.c
	config.c
	config.h
	file.c
	file.h
	http.c
	http.h
	json.c
	json.h
	readpass.c
	ssl.c
	ssl.h
	str.c
	str.h
	types.h
merge with cliaspora 0.1.8's code
merge with cliaspora 0.1.8 works :) problem's solved