Merge commit 'origin/bug_308_add_where_softwaremanager' into experimental
authorMladen Horvat <acid-burn@opendreambox.org>
Mon, 7 Dec 2009 13:22:39 +0000 (14:22 +0100)
committerMladen Horvat <acid-burn@opendreambox.org>
Mon, 7 Dec 2009 13:22:39 +0000 (14:22 +0100)
Conflicts:
lib/python/Plugins/Plugin.py


No differences found