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

[Cédric OLIVIER]

commit 64851a457a697eb5504f72ca03358a01c8f599d7
Merge: 36dbb75 c82cc0f
Author: Cédric OLIVIER <cedric.olivier at free.fr>
Date:   Fri Oct 3 07:33:13 2014 +0200

    Merge branch 'master' into f20
    
    Conflicts:
    	.gitignore
    	josm
    	josm-0-add_classpath.patch
    	josm.spec
    	sources
    
    Update ti 7588 svn revision

 .gitignore                 |    1 +
 josm                       |    2 +-
 josm-0-add_classpath.patch |   11 +++++++++++
 josm.spec                  |   18 +++++++++++++-----
 sources                    |    2 +-
 5 files changed, 27 insertions(+), 7 deletions(-)
---