summary refs log tree commit diff stats
path: root/test
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-04-09 04:19:11 +0200
committerhut <hut@lavabit.com>2010-04-09 04:19:11 +0200
commit35f16f2fc1d99e1753af3bb95b46dbad2122a349 (patch)
tree56bbb9c18188e81bc2cb09948dfa3653b5a67ee3 /test
parentfeaf9e0a81cf2506b18ad9dbb9732e0be45c10fc (diff)
parent035a39a8a468ba842fd69a2370aba8ac3c1f3d39 (diff)
downloadranger-35f16f2fc1d99e1753af3bb95b46dbad2122a349.tar.gz
Merge branch 'master' into newkey
Conflicts:
	ranger/defaults/keys.py
Diffstat (limited to 'test')
0 files changed, 0 insertions, 0 deletions