Merge branch 'master' of https://github.com/tansaku/LocalSupport
Merge branch 'master' of https://github.com/tansaku/LocalSupport
Merge branch 'master' of https://github.com/tansaku/LocalSupport
Merge branch 'master' of https://github.com/tansaku/LocalSupport
Merge branch 'master' of https://github.com/tansaku/LocalSupport
Merge branch 'master' of https://github.com/tansaku/LocalSupport
Merge branch 'master' of https://github.com/tansaku/LocalSupport
Merge branch 'master' of https://github.com/tansaku/LocalSupport
Merge branch 'master' of https://github.com/tansaku/LocalSupport into mail_features
Merge remote-tracking branch 'upstream/master'
pending cucumber for email
add ActionMailer to cucumber features - failing
still need to figure out why Retrieve password for a non-existent user seems to send email
clear ActionMailer queue in background steps
Merge branch 'master' into mail_features
Merge pull request #76 from marianmosley/master

Add cucumber steps for email