summary refs log tree commit diff stats
path: root/Makefile
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2011-10-24 00:54:50 +0200
committerhut <hut@lavabit.com>2011-10-24 00:54:50 +0200
commit98f6125513be5b83814a5b1894014bccd3edd547 (patch)
treeb3002f15a2a4389e50fdacde5e39debd9d3864a6 /Makefile
parent2f7e770983ba9219b892f3d739b55e0bc724205c (diff)
parent6e7e38b94ac1908fc4e027c805a0fb9b987608df (diff)
downloadranger-98f6125513be5b83814a5b1894014bccd3edd547.tar.gz
Merge branch 'stable'
Conflicts:
	ranger/__init__.py
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions