private.xml
caches
Merge branch 'master' of https://github.com/nandorodpires2/newfinances2

Conflicts:
	application/data/cache/zend_cache---internal-metadatas---10de3b0a1f682c3c59294ff288aebe91
	application/data/cache/zend_cache---internal-metadatas---Zend_LocaleC_pt_BR_day_gregorian_format_wide_wed
	application/data/cache/zend_cache---internal-metadatas---b01c8d953c86a2eb43bfae7848a24a3a
atualizacoes
atualizacoes