[DRE-commits] [librarian-puppet] 06/97: Merge pull request #123 from petems/patch-1

[Stig Sandbeck Mathisen]

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

ssm pushed a commit to branch master
in repository librarian-puppet.

commit 104a44dd0b08a04c547b1f6ec28c592ed4d8803e
Merge: adb1c10 baa1889
Author: Patrick Connolly <patrick at myplanetdigital.com>
Date:   Wed Nov 13 10:18:55 2013 -0800

    Merge pull request #123 from petems/patch-1
    
    Bump aruba timeouts to greenify travis.

 README.md               | 2 ++
 features/support/env.rb | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

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