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

Mon Jul 25 15:58:56 UTC 2011

commit ae2d1bea813ad9069c058ddb28aba97c879013a8
Merge: 293bbdf d9bd7dc
Author: Michel Alexandre Salim <salim at fauix11.informatik.uni-erlangen.de>
Date:   Mon Jul 25 17:57:39 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                  |   21 ++++-
 5 files changed, 207 insertions(+), 5 deletions(-)
---