Javier Varona f0d0037355 Merge branch 'master' of https://bitbucket.org/bilthon/fullerene ... # Conflicts: # src/main/java/com/luminiasoft/bitshares/FileBin.java		2016-12-02 00:47:58 -04:00
..
luminiasoft/bitshares	Merge branch 'master' of https://bitbucket.org/bilthon/fullerene	2016-12-02 00:47:58 -04:00