Merge branch 'master' of github.com:spesmilo/electrum

RELEASE-NOTES

@@ -14,8 +14,8 @@
  * Multisig transactions can be signed with Trezor. When you create
    the multisig wallet, just enter the xpub of your existing Trezor
    wallet.
- * Transaction fees set manually in the GUI are retained when the user
+ * Transaction fees set manually in the GUI are retained, including
-   uses the '!' shortcut.
+   when the user uses the '!' shortcut.
  * New 'email' plugin, that enables sending and receiving payment
    requests by email.
 
@@ -419,4 +419,3 @@ For an example, see Gavin's tutorial: https://gist.github.com/gavinandresen/3966
 * (Feature) Added a label dialog after sending a transaction.
 * (Feature) Reworked receiving addresses; instead of a random selection from one of your receiving addresses a new widget will show listing unused addresses.
 * (Chore)   Removed server selection. With all the new server options a simple menu item does not suffice anymore.
-

lib/util.py

@@ -204,6 +204,8 @@ def time_difference(distance_in_time, include_seconds):
 block_explorer_info = {
     'Biteasy.com': ('https://www.biteasy.com/blockchain',
                         {'tx': 'transactions', 'addr': 'addresses'}),
+    'Bitflyer.jp': ('https://chainflyer.bitflyer.jp',
+                        {'tx': 'Transaction', 'addr': 'Address'}),
     'Blockchain.info': ('https://blockchain.info',
                         {'tx': 'tx', 'addr': 'address'}),
     'Blockr.io': ('https://btc.blockr.io',