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

[Jonathan Dieter]

commit 74647295fc326aec63fb8d61e90ccc321df318f4
Merge: bffbd3f 9422f35
Author: Jonathan Dieter <jdieter at lesbg.com>
Date:   Thu Jun 28 18:23:45 2012 +0300

    Merge branch 'HEAD' of ssh://jdieter@pkgs.fedoraproject.org/naev-data

 .gitignore |    1 +
 sources    |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
---