[rubygem-rails/f18: 2/2] Merge branch 'master' into f18

[Vít Ondruch]

commit 266418166640f89af005e52defff2443ef783892
Merge: c4b4376 c88eafb
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Mon Aug 13 12:16:17 2012 +0200

    Merge branch 'master' into f18

 .gitignore         |    1 +
 rubygem-rails.spec |    5 ++++-
 sources            |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---