about summary refs log tree commit diff stats
path: root/setup.py
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2013-02-22 04:46:09 +0100
committerhut <hut@lavabit.com>2013-02-22 04:46:09 +0100
commitbf6a3d6d6c11a85c37322e713b3c7a6eb2a484fc (patch)
tree776b05d2e7ed9ae03a3fb1115b8ae023e5bebbdd /setup.py
parent4d48d33ca5529464dadbb2fc70888da4cd9d24fa (diff)
parentc1138eb006c6daaa9b88204b0695f18d55e027dc (diff)
downloadranger-bf6a3d6d6c11a85c37322e713b3c7a6eb2a484fc.tar.gz
Merge branch 'master' into vcs
Conflicts:
	ranger/gui/widgets/browsercolumn.py
Diffstat (limited to 'setup.py')
-rwxr-xr-xsetup.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index b4be9965..5d71cb53 100755
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (C) 2009, 2010, 2011  Roman Zimbelmann <romanz@lavabit.com>
+# Copyright (C) 2009-2013  Roman Zimbelmann <hut@lavabit.com>
 # This software is distributed under the terms of the GNU GPL version 3.
 
 import distutils.core