Code maintenance

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7335 b45a01b8-16f6-495d-af2f-9b41ad6348cc
Code maintenance

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7336 b45a01b8-16f6-495d-af2f-9b41ad6348cc