Merge branch 'master' of git://nbd.name/uci
authorJo-Philipp Wich <jow@openwrt.org>
Mon, 19 Dec 2011 18:10:07 +0000 (19:10 +0100)
committerJo-Philipp Wich <jow@openwrt.org>
Mon, 19 Dec 2011 18:10:07 +0000 (19:10 +0100)
commit16efed543212c44e1d8af01a2471801792c0a32d
treed47d4413d6b40c86375bd0e245e5db5a661e81a1
parent359c5c4dcc087413fc01b75a688d7a9c6d4b1c1b
parent7289b2d69aaffa9299b47aaaa0da1e9969ace6c1
Merge branch 'master' of git://nbd.name/uci