summary refs log tree commit diff stats
path: root/COPYING
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2011-04-26 21:49:23 +0200
committerhut <hut@lavabit.com>2011-04-26 21:49:23 +0200
commit9a99feacea7297f8478e111d8731a4411ad6c1a5 (patch)
tree0bbcc0abbda04b8e109ada488172c24ad5411e22 /COPYING
parent3e2d6f2f3d4e6f8c71db73a26320bf0699671ba1 (diff)
parent2ed2d4f79238ce505724fc5873c6a912e19be305 (diff)
downloadranger-9a99feacea7297f8478e111d8731a4411ad6c1a5.tar.gz
Merge branch 'stable'
Conflicts:
	ranger.py
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions