Merge branch 'master' into bmx6_testing

Conflicts:
	bmx6/Makefile
	olsrd/Makefile

diff --git a/bmx6/Makefile b/bmx6/Makefile
index f0fe9fc9f59316b4dad0c9c982202ae69958f418..f560c47f9c182ed497e06d5250b8aebf471405eb 100644 (file)
--- a/bmx6/Makefile
+++ b/bmx6/Makefile
@@ -31,8 +31,8 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://bmx6.net/bmx6.git
 #PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
 
-PKG_REV:=6c57a8062f737ae3d3a761b2f557142e1c969ccf
-PKG_VERSION:=r2013060802
+PKG_REV:=0a761a621b203af6c9edcd94872f91c1c60fa383
+PKG_VERSION:=r2013051001
 PKG_RELEASE:=4
 
 PKG_SOURCE_VERSION:=$(PKG_REV)