Merge branch 'vuplus_experimental' of 192.168.102.66:/opt/repository/enigma2 into...
authorkos <kos@dev3>
Wed, 28 Sep 2011 14:35:14 +0000 (23:35 +0900)
committerkos <kos@dev3>
Wed, 28 Sep 2011 14:35:14 +0000 (23:35 +0900)
commit998c932f39f22d35c56d742c20c0bccb0d202bfc
treecf84b5d9f33bf95343da3189ad4d61e8049c847e
parenteef231b0e9073b8a92fefc48858b785599ccef15
parent1a80430c750fbd7e5725a9cfa3c5dd093d20bc79
Merge branch 'vuplus_experimental' of 192.168.102.66:/opt/repository/enigma2 into vuplus_experimental

Conflicts:
configure.ac
lib/python/Plugins/SystemPlugins/Makefile.am
configure.ac
lib/python/Plugins/SystemPlugins/Makefile.am