Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Daniel Bye 2012-01-09 12:33:26 +00:00
commit 8d4d783916

View file

@ -8,7 +8,7 @@ alias bu="bundle update"
# The following is based on https://github.com/gma/bundler-exec
bundled_commands=(cap capify cucumber foreman guard heroku nanoc rackup rainbows rake rspec ruby shotgun spec spork thin unicorn unicorn_rails)
bundled_commands=(annotate cap capify cucumber foreman guard heroku nanoc rackup rainbows rake rspec ruby shotgun spec spork thin unicorn unicorn_rails)
## Functions