Update bmx6. New functionallity of tunnel creation ondemand
bmx6-testing: update testing branch
Merge branch 'master' into bmx6_testing

Conflicts:
	bmx6/Makefile
	olsrd/Makefile
Merge branch 'master' into bmx6_testing

Conflicts:
	bmx6/Makefile
Merge branch 'master' into bmx6_testing
bmx6/Makefile: update testing new config style
Adapt tunnels web view to new bmx6 syntax and options
Merge branch 'master' into bmx6_testing
Merge branch 'master' into bmx6_testing
bmx6: update to 5fbbc59b (current master tip)
bmx6: update to d1464ee4 (current testing tip)
Merge branch 'bmx6_testing' into bmx6_testing_new_config

Conflicts:
	bmx6/Makefile
Revert "Adapt tunnels web view to new bmx6 syntax and options"

This reverts commit b493828d75c23d2733fafd317c9d5859959d8c3f.
bmx6: fixing 501559 crash ?
if we could not get the l3 device in olsrd_write_interface then try to get the
	physical device instead. But only if the protocoll is "static" or "none".
	This is useful to write Interfaces in the resulting olsrd.conf file which
	are not up at the time olsrd is starting (e.g. tunnel interfaces):
Revert "Revert "Adapt tunnels web view to new bmx6 syntax and options""

This reverts commit 6360d4c977b6b8fb6b0c80e0fcd29f43e0cc1cba.
Merge branch 'bmx6_testing_new_config' into bmx6_testing
Merge branch 'master' into bmx6_testing

Conflicts:
	bmx6/Makefile
alfred: add alfred 2013.3.0 to feed

Add A.L.F.R.E.D - Almighty Lightweight Fact Remote Exchange Daemon
to the OpenWRT routing feed. This package contains the latest stable
release of alfred which has been recently published by the
open-mesh.org community. A description follows below.

alfred is a user space daemon for distributing arbitrary local
information over the mesh/network in a decentralized fashion. This data
can be anything which appears to be useful - originally designed to
replace the batman-adv visualization (vis), you may distribute
hostnames, phone books, administration information, DNS information,
the local weather forecast ...

alfred runs as daemon in the background of the system. A user may insert
information by using the alfred binary on the command line, or use
special programs to communicate with alfred (done via unix sockets).
alfred then takes care of distributing the local information to other
alfred servers on other nodes. This is done via IPv6 link-local
multicast, and does not require any configuration. A user can request
data from alfred, and will receive the information available from all
alfred servers in the network.

Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Merge pull request #5 from mmunz/master

if we could not get the l3 device in olsrd_write_interface then try to g...