diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2010-11-18 10:53:54 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2010-11-18 10:53:54 -0200 |
| commit | dcd5a3b7f546fe6934e91e3ce0c1e68a9bbc6a3a (patch) | |
| tree | 94d9cbdef5001c398bd2bb4d5d7a4416de781646 /bootstrap | |
| parent | 0909e5395199cfb731964487abfa0bd857f7b94f (diff) | |
| parent | d9721fd16ad489d400dd085aa7ba8a4d83baf3d3 (diff) | |
| download | keyringer-dcd5a3b7f546fe6934e91e3ce0c1e68a9bbc6a3a.tar.gz keyringer-dcd5a3b7f546fe6934e91e3ce0c1e68a9bbc6a3a.tar.bz2 | |
Merge branch 'master' of git://lair.fifthhorseman.net/~dkg/keyringer
Conflicts:
keyringer
Diffstat (limited to 'bootstrap')
0 files changed, 0 insertions, 0 deletions