Merge pull request #2930 from Diapolo/displayUnit
Bitcoin-Qt: fixes for using display unit from options