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

[Vít Ondruch]

commit 85f7535263c8fe215ee72439225dceb80f4356f2
Merge: 791bd8b ad297b4
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Fri Mar 25 09:35:17 2011 +0100

    Merge branch 'master' into f15/master

 .gitignore               |    1 +
 rubygem-activemodel.spec |   15 +++++++++++----
 sources                  |    4 ++--
 3 files changed, 14 insertions(+), 6 deletions(-)
---