Merge branch 'batman-adv'
authorJo-Philipp Wich <jow@openwrt.org>
Thu, 18 Apr 2013 16:54:45 +0000 (18:54 +0200)
committerJo-Philipp Wich <jow@openwrt.org>
Thu, 18 Apr 2013 16:54:45 +0000 (18:54 +0200)
commit905b7be393afbe3044403803bb38b4c7c7e38986
tree003ac7717195e63d3231ea3f4e68d064c886ac77
parente9086436d265d71579d9f75cdd23e6a0cad6cb17
parenta0e2bb6a79893b9fa91c916363708c06e176fca1
Merge branch 'batman-adv'