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

[Cédric OLIVIER]

commit 24c5f05db7f752adda5e713d6157d993e884f1f9
Merge: 1bd8263 38a4446
Author: Cédric OLIVIER <cedric.olivier at free.fr>
Date:   Sun Oct 26 08:43:31 2014 +0100

    Merge branch 'master' into f21

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