[rubygem-heroku/f17: 2/2] Merge branch 'master' into f17

[Vít Ondruch]

commit c7de9a485b01f3657b9d05aaa7b8fdf86ebfdd1f
Merge: b5ce8e1 5a1d5aa
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Fri Apr 6 14:14:07 2012 +0200

    Merge branch 'master' into f17

 .gitignore          |    1 +
 rubygem-heroku.spec |   14 +++++---------
 sources             |    2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)
---