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)
commit9fb95ee068cee8f91e0404c83a47203f801eea70
tree9ef7012ca58ef214cfebcb340830e1285f3c3418
parent9fa29f2d2b3d5d7c25af94ce127177ccbcd0b370
Merge branch 'master' of git://nbd.name/openwrt

Conflicts:

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23532 3c298f89-4303-0410-b956-a3cf2f4a3e73
package/opkg/patches/009-remove-upgrade-all.patch [new file with mode: 0644]