From: Axel Neumann <neumann@cgws.de>
Date: Sat, 8 Jun 2013 15:11:15 +0000 (+0200)
Subject: Merge branch 'master' into bmx6_testing
X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=c7cfd491f059d2f9da94598612d76f8da37727c8;hp=--cc;p=lede-routing%2F.git

Merge branch 'master' into bmx6_testing

Conflicts:
	bmx6/Makefile
	olsrd/Makefile
---

c7cfd491f059d2f9da94598612d76f8da37727c8