These shouldn't be on repo either
Merge branch 'master' of github.com:RMerl/asuswrt-merlin

Conflicts:
	release/src/router/libupnp/libupnp.so
	release/src/router/ndisc6/po/Makefile.in