Merge remote branch 'origin/acid-burn/network_changes_next' into experimental
authorMladen Horvat <acid-burn@opendreambox.org>
Thu, 14 Apr 2011 18:41:17 +0000 (20:41 +0200)
committerMladen Horvat <acid-burn@opendreambox.org>
Thu, 14 Apr 2011 18:41:17 +0000 (20:41 +0200)
commit2339ec3c8dcf249e2255aff2d364e1855fde4a25
treeb1b13a792088a5e5d8acb538da1bd8ff5a505e19
parent155cecc9dd0bd08864df8ab6ca2f4522a8b043e4
parent710962d4f216b12c7cc25a189cbcc890a2ab5622
Merge remote branch 'origin/acid-burn/network_changes_next' into experimental
lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py