Javier Varona e235e096c9 Merge origin/master ... Conflicts: src/main/java/com/luminiasoft/bitshares/FileBin.java		2016-12-04 12:33:57 -04:00
..
com/luminiasoft/bitshares	Merge origin/master	2016-12-04 12:33:57 -04:00