diff options
| author | Zapata <zapata@xs4all.nl> | 2011-01-29 22:31:36 +0100 |
|---|---|---|
| committer | Zapata <zapata@xs4all.nl> | 2011-01-29 22:31:36 +0100 |
| commit | 6a9ba2257dfeccee61169c1e213515058eae2ba1 (patch) | |
| tree | 3d33195f9b89863ebbea3c0951a41ef3bed57c1f /README | |
| parent | 5196fb316c1afc2b6b0d11132e105c7f1fb841fe (diff) | |
| parent | 4987cf64fcfd6c417c06a3f939182b1052fe57c9 (diff) | |
| download | keyringer-6a9ba2257dfeccee61169c1e213515058eae2ba1.tar.gz keyringer-6a9ba2257dfeccee61169c1e213515058eae2ba1.tar.bz2 | |
Merge remote branch 'origin/ruby' into ruby
Conflicts:
bin/keyringer
lib/keyringer.rb
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions