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

[Vít Ondruch]

commit b5ce8e1c7a1e7ec41cec62a6cb2c1f629291d377
Merge: 0a2bfa6 cf75ae7
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Wed Apr 4 15:38:55 2012 +0200

    Merge branch 'master' into f17

 .gitignore          |    2 +
 rubygem-heroku.spec |  111 +++++++++++++++++++++++++++++++++++++--------------
 sources             |    2 +-
 3 files changed, 84 insertions(+), 31 deletions(-)
---