[rubygem-shoulda/f13/master: 3/3] Merge branch 'master' into f13

[Jeroen van Meeuwen]

commit bc77d2eb540b52ccb873e0f4cf960f334f80740e
Merge: ea4f48b 8b89895
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date:   Fri Aug 6 22:10:13 2010 +0200

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

 rubygem-shoulda-init.rb            |    1 +
 rubygem-shoulda-tasks_shoulda.rake |    1 +
 rubygem-shoulda.spec               |  101 ++++++++++++++++++++++++++++++++++++
 sources                            |    1 +
 4 files changed, 104 insertions(+), 0 deletions(-)
---