Merge branch 'bug_308_add_where_softwaremanager'
authoracid-burn <acid-burn@opendreambox.org>
Wed, 23 Dec 2009 05:57:25 +0000 (06:57 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Wed, 23 Dec 2009 05:57:25 +0000 (06:57 +0100)
Conflicts:
lib/python/Plugins/Plugin.py


No differences found