[DRE-commits] [ruby-aruba] 02/04: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-ruby-extras/ruby-aruba

[Hideki Yamane]

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

henrich pushed a commit to branch master
in repository ruby-aruba.

commit b898770552cecd6eb7ea0e7b3cdf16810e210088
Merge: 22d7ff5 de1ff9c
Author: Hideki Yamane <henrich at debian.org>
Date:   Sun Oct 6 01:00:22 2013 +0900

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-ruby-extras/ruby-aruba
    
    Conflicts:
    	debian/changelog

 .gitignore                                         |    1 +
 debian/changelog                                   |    8 ++++--
 debian/control                                     |   12 ++++----
 debian/copyright                                   |   29 ++++++++++++++++++--
 .../patches/path-manipulation-for-templates.patch  |   16 +++++++++++
 debian/patches/series                              |    1 +
 debian/ruby-aruba.docs                             |    3 +-
 debian/ruby-aruba.install                          |    1 +
 debian/ruby-aruba.links                            |    1 +
 debian/ruby-test-files.yaml                        |    7 -----
 debian/ruby-tests.rake                             |    7 +++++
 debian/rules                                       |   11 ++++++++
 debian/source/local-options                        |    1 +
 13 files changed, 79 insertions(+), 19 deletions(-)

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