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

[Michel Alexandre Salim]

commit 6cdddd249cb6bd0d752681870bb4c07bce639c74
Merge: f6e2e3f f6612b9
Author: Michel Alexandre Salim <michel at sylvestre.me>
Date:   Tue Mar 22 09:59:37 2011 +0100

    Merge branch 'master' into f13

 .gitignore                |    2 +-
 sources                   |    2 +-
 zeroinstall-injector.spec |    5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)
---