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

Sat Jul 2 21:44:15 UTC 2011

commit 97c6b663bb7f4ee182321f05e891734ac32f020b
Merge: 293bbdf d9bd7dc
Author: Michel Alexandre Salim <michel.salim at cs.fau.de>
Date:   Sat Jul 2 23:43:53 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(-)
---