[zeroinstall-injector/el6: 3/3] Merge branch 'master' into el6

Mon Jul 25 18:43:38 UTC 2011

commit 40198cc11b4c25ab54ebe90599b49d458df6772e
Merge: 065a97a c734330
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Mon Jul 25 20:43:17 2011 +0200

    Merge branch 'master' into el6

 .gitignore                                 |    2 +-
 sources                                    |    2 +-
 zeroinstall-injector-1.1-rm-space.patch    |   57 ------------
 zeroinstall-injector-1.1-rm-versions.patch |  130 ----------------------------
 zeroinstall-injector.spec                  |   15 ++--
 5 files changed, 8 insertions(+), 198 deletions(-)
---