[rubygem-rdoc/f17: 2/2] Merge branch 'master' into f17

[Vít Ondruch]

commit 99aeba31bd18f697ed3a2792579e5a729515c37c
Merge: 0666434 e481b0d
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Mon Apr 2 14:04:00 2012 +0200

    Merge branch 'master' into f17

 rubygem-rdoc.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---