Stein Magnus Jodal 61375f0edc Merge branch 'develop' into feature/mpris-frontend ... Conflicts: docs/changes.rst		2011-06-07 02:30:01 +02:00
..
base	Merge branch 'develop' into feature/mpris-frontend	2011-06-07 02:30:01 +02:00
local	Rename data_folder() to path_to_data_dir()	2011-04-07 15:55:03 +02:00
__init__.py	Replace CoverageTestRunner with nosetests	2010-03-23 23:54:49 +01:00