Merge pull request #1 from openwrt-routing/master
authorManuel Munz <manu@somakoma.de>
Fri, 23 Aug 2013 09:12:47 +0000 (02:12 -0700)
committerManuel Munz <manu@somakoma.de>
Fri, 23 Aug 2013 09:12:47 +0000 (02:12 -0700)
merge upstream


Trivial merge