[rubygem-railties/f15/master: 3/3] Merge branch 'master' into f15/master

[Vít Ondruch]

commit b9f5e37f2e1c51a59650a4a8ba62a5448dcb9e2a
Merge: eeea397 80f66f0
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Tue Mar 29 09:13:35 2011 +0200

    Merge branch 'master' into f15/master

 .gitignore            |    1 +
 rubygem-railties.spec |   15 ++++++++-------
 sources               |    2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)
---