Matias Alejo Garcia 1dc420b215 Merge pull request #697 from cmgustavo/feature/addressbook ... Addressbook		2014-06-19 17:03:18 -03:00
..
blockchain	fix conflics	2014-06-19 16:34:37 -03:00
core	Fix Conflicts:	2014-06-19 16:43:34 -03:00
network	fix secure:false	2014-06-10 10:49:26 -03:00
storage	implements delete wallet, in backuptab	2014-06-16 17:37:33 -03:00