Merge branch 'filter_by_filetype' of https://github.com/tex/ranger
commitc82a8a76989c87381a4e7a676f93ad4bf701c58b
authorhut <hut@lepus.uberspace.de>
Fri, 5 Dec 2014 15:40:42 +0000 (5 16:40 +0100)
committerhut <hut@lepus.uberspace.de>
Fri, 5 Dec 2014 15:40:42 +0000 (5 16:40 +0100)
tree78e41853574af9e5fcfa8fed2df8357b355d5f9b
parent5b6901f8067d783fd3e91efe32553339b4746c52
parentf9b4e8c0a31d38fb48ee0e61e17a9534f00fdd82
Merge branch 'filter_by_filetype' of https://github.com/tex/ranger

Conflicts:
ranger/config/commands.py
doc/ranger.pod
ranger/config/commands.py
ranger/container/directory.py