[DRE-commits] [ruby-stud] 02/02: Merge branch 'upstream'

[Tim Potter]

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

tpot-guest pushed a commit to branch master
in repository ruby-stud.

commit 910da7ffecf62d40beeb2130ce441fcaacb78af5
Merge: 369640c de6c8fd
Author: Tim Potter <tpot at hp.com>
Date:   Thu Jun 25 12:31:17 2015 +1000

    Merge branch 'upstream'

 lib/stud/benchmark.rb        |  132 -----
 lib/stud/benchmark/rusage.rb |   54 --
 lib/stud/interval.rb         |   37 +-
 lib/stud/task.rb             |    8 +
 lib/stud/temporary.rb        |    3 +-
 lib/stud/time.rb             |   37 --
 lib/stud/time/format.rb      | 1323 ------------------------------------------
 lib/stud/time/format.tt      |  236 --------
 lib/stud/trap.rb             |    6 +
 lib/stud/try.rb              |   12 +-
 metadata.yml                 |   82 +--
 11 files changed, 68 insertions(+), 1862 deletions(-)

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