[naev-data: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/naev-data

[Jonathan Dieter]

commit 9422f35902002e094d1b864549340749188d7e58
Merge: d12b2d8 c960a9b
Author: Jonathan Dieter <jdieter at lesbg.com>
Date:   Thu Jun 28 18:20:45 2012 +0300

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/naev-data
    
    Conflicts:
    	.gitignore
    	sources

 naev-data.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---