[rubygem-shoulda/el5/master: 2/2] Merge branch 'master' into el5

[Michael Stahnke]

commit e6b17e88c72829062fd442c760183667e79dde55
Merge: 596e8a0 86b8358
Author: stahnma <stahnma at websages.com>
Date:   Tue Sep 7 12:15:07 2010 -0400

    Merge branch 'master' into el5

 .gitignore           |    1 +
 rubygem-shoulda.spec |  146 +++++++++++++++++++++++++++++---------------------
 sources              |    2 +-
 3 files changed, 87 insertions(+), 62 deletions(-)
---