[libxmp/f20: 11/11] Merge branch 'master' into f20

[Dominik Mierzejewski]

commit f8be7bdca238ab616c682ead3e0470be75f056ad
Merge: 47691ea 290dd18
Author: Dominik 'Rathann' Mierzejewski <dominik at greysector.net>
Date:   Mon Feb 9 15:07:33 2015 +0100

    Merge branch 'master' into f20
    
    Conflicts:
    	.gitignore
    	libxmp.spec
    	sources

 .gitignore  |    5 +++++
 libxmp.spec |    5 ++++-
 sources     |    2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
---