[josm/f20: 2/2] Merge branch 'master' into f20

[Cédric OLIVIER]

commit 9f28c9ec2c7e066f7e710fe0c0fc22be6f4b3ef6
Merge: 64851a4 38a4446
Author: Cédric OLIVIER <cedric.olivier at free.fr>
Date:   Sun Oct 26 18:40:28 2014 +0100

    Merge branch 'master' into f20

 .gitignore |    1 +
 josm.spec  |    7 +++++--
 sources    |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---