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)
commite30375030efc63c0f1fd6a89fb228ef8f829dd2c
tree9ef7012ca58ef214cfebcb340830e1285f3c3418
parente1dc15475b73899a38405911ce189c278d1f26ae
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]