Merge branch 'upstream/master'

Conflicts:
	src/bitmessageqt/__init__.py
	src/translations/bitmessage_en_pirate.pro
	src/translations/bitmessage_fr.pro
	src/translations/bitmessage_fr_BE.pro
	src/translations/bitmessage_ru.pro
This commit is contained in:
sendiulo 2013-08-22 11:39:24 +02:00
commit 383cc59991