Merge branch 'master' of git://nbd.name/openwrt
authorFlorian Fainelli <florian@openwrt.org>
Tue, 19 Oct 2010 07:06:12 +0000 (07:06 +0000)
committerFlorian Fainelli <florian@openwrt.org>
Tue, 19 Oct 2010 07:06:12 +0000 (07:06 +0000)
commitb55f4bdd60cb2c193d53b16efbaa240ced05e83b
tree8839b90ef16de45cf7bab8cc96866e0065671c9d
parent191bf3732846cf1f7b1aac08af73360dffef7b75
Merge branch 'master' of git://nbd.name/openwrt

Conflicts:

package/opkg/patches/009-remove-upgrade-all.patch

SVN-Revision: 23532
package/opkg/patches/009-remove-upgrade-all.patch [new file with mode: 0644]