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

[Vít Ondruch]

commit 505a719ba5bc16b9c9c2d8b41ead2895c9a3bd78
Merge: 526b5fb d84fdb3
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Mon Aug 13 12:10:56 2012 +0200

    Merge branch 'master' into f18

 .gitignore                                         |    2 ++
 ...gem-actionpack-relax-sprockets-dependency.patch |    4 ++--
 rubygem-actionpack.spec                            |   11 +++++++----
 sources                                            |    4 ++--
 4 files changed, 13 insertions(+), 8 deletions(-)
---