[DRE-commits] [pry] 01/04: Merge tag 'upstream/0.10.1'

[David Suárez]

This is an automated email from the git hooks/post-receive script.

deiv-guest pushed a commit to branch master
in repository pry.

commit ccc6a9c5514268f411a7ae52762dc4a46b0cb2d2
Merge: c9789d2 da63c24
Author: David Suárez <david.sephirot at gmail.com>
Date:   Wed Sep 24 19:44:40 2014 +0200

    Merge tag 'upstream/0.10.1'
    
    Upstream version 0.10.1

 CHANGELOG.md                                    |  11 +++++++++--
 README.md                                       |   2 +-
 checksums.yaml.gz                               | Bin 268 -> 269 bytes
 lib/pry/code.rb                                 |   9 +++++++--
 lib/pry/commands/bang.rb                        |   2 +-
 lib/pry/commands/cat/abstract_formatter.rb      |   2 +-
 lib/pry/commands/cat/file_formatter.rb          |   2 +-
 lib/pry/commands/ls/formatter.rb                |   2 +-
 lib/pry/commands/show_source.rb                 |   2 +-
 lib/pry/commands/watch_expression.rb            |   2 +-
 lib/pry/commands/watch_expression/expression.rb |   4 ++--
 lib/pry/commands/whereami.rb                    |   2 +-
 lib/pry/config/behavior.rb                      |   2 +-
 lib/pry/config/convenience.rb                   |   1 -
 lib/pry/config/default.rb                       |   4 ----
 lib/pry/editor.rb                               |   4 +++-
 lib/pry/history.rb                              |  14 ++++++++------
 lib/pry/method/weird_method_locator.rb          |   2 +-
 lib/pry/pager.rb                                |   3 ++-
 lib/pry/plugins.rb                              |   2 +-
 lib/pry/pry_class.rb                            |   2 +-
 lib/pry/pry_instance.rb                         |  14 ++++++++++++--
 lib/pry/terminal.rb                             |   2 +-
 lib/pry/version.rb                              |   2 +-
 lib/pry/wrapped_module.rb                       |   4 ++++
 metadata.yml                                    |   4 ++--
 26 files changed, 63 insertions(+), 37 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/pry.git