Merge commit 'refs/merge-requests/125' of git://gitorious.org/gitorious/mainline... saltation_deploy_v3
authorMatthias Hoermann <taladar@taladar.net>
Wed, 13 Jul 2011 08:50:59 +0000 (10:50 +0200)
committerMatthias Hoermann <taladar@taladar.net>
Wed, 13 Jul 2011 08:50:59 +0000 (10:50 +0200)
commitf7a387028124f928d892e0a5d2a0aea49e7f8655
treeecc3ef3b864cf775fe117408d314e6aa014849f9
parent44b87a944a1d45931b11f7a1ff7c33ab2355081c
parent91421a4973d95e8e1ec1c9f7a0fd93995f514237
Merge commit 'refs/merge-requests/125' of git://gitorious.org/gitorious/mainline into merge-requests/125
app/models/user.rb
test/unit/user_test.rb