Merge branch 'acid-burn/bug_622_swupgrade_networkcheck' into experimental
authoracid-burn <acid-burn@opendreambox.org>
Tue, 23 Nov 2010 15:02:01 +0000 (16:02 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Tue, 23 Nov 2010 15:02:01 +0000 (16:02 +0100)
commit5138dce8cfa3d4987ebc8899d5fd990883d1a1dc
treeca37001ebf6a0ea614d9f423ae62dd208da188bf
parent875ad71cf9bcace9336cb8eafa8974b84a5347b2
parent0fe25bffe34c9a5fd50528d5ff2eb576b149163b
Merge branch 'acid-burn/bug_622_swupgrade_networkcheck' into experimental
lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py