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

[Vít Ondruch]

commit 2334929eb14c6c47627857a4eba9b1ed72f06394
Merge: ae7e918 d6780b1
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Mon Aug 13 12:01:24 2012 +0200

    Merge branch 'master' into f18

 .gitignore                  |    2 ++
 rubygem-activeresource.spec |    9 ++++++---
 sources                     |    4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)
---