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

[Vít Ondruch]

commit 15059a412b933af10d365067940805794c5d857f
Merge: 7809571 cb0b0b3
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Wed Jun 29 08:28:47 2011 +0200

    Merge branch 'master' into f15

 .gitignore            |    2 --
 clog                  |    3 ++-
 railties-3.0.6.gem    |  Bin 1548800 -> 0 bytes
 rubygem-railties.spec |   10 ++++------
 sources               |    2 +-
 5 files changed, 7 insertions(+), 10 deletions(-)
---