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

[Michel Alexandre Salim]

commit 2c65194cfd76bbc20e8044581a55c9ab280b5d89
Merge: 40198cc d4befe9
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Fri Jan 27 13:53:12 2012 +0100

    Merge branch 'f16' into el6

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