Merge branch 'stable' into preview

Conflicts:
	ranger/shared/settings.py

1 files changed, 6 insertions, 0 deletions

diff --git a/test/tc_bookmarks.py b/test/tc_bookmarks.py
index 9b41f1c6..59435f06 100644
--- a/test/tc_bookmarks.py
+++ b/test/tc_bookmarks.py
@@ -13,6 +13,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import os.path
+import sys
+rangerpath = os.path.join(os.path.dirname(__file__), '..')
+if sys.path[1] != rangerpath:
+	sys.path[1:1] = [rangerpath]
+
 from os.path import realpath, join, dirname
 import unittest
 import os