diff options
| author | hut <hut@lavabit.com> | 2013-02-18 01:21:16 +0100 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2013-02-18 01:21:16 +0100 |
| commit | 740d1e5fd20525f2ac2c6b6af493b0c21d2e845e (patch) | |
| tree | 58bb68e0ba333c39bc40bb1e1e130c3dbd056f59 /setup.py | |
| parent | 95bca173ce92294f31c052555b78938626f3c120 (diff) | |
| parent | 2b3110fcfe4ecfeec120c700eb7b7ddb85c4fc40 (diff) | |
| download | ranger-740d1e5fd20525f2ac2c6b6af493b0c21d2e845e.tar.gz | |
Merge branch 'master' into vcs
Conflicts: doc/ranger.1
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions