Merge branch 'stable' into pud
authorFerry Huberts <f.huberts@mindef.nl>
Tue, 13 Dec 2011 10:01:46 +0000 (11:01 +0100)
committerFerry Huberts <f.huberts@mindef.nl>
Tue, 13 Dec 2011 10:01:46 +0000 (11:01 +0100)
commit6866777c60c39b410c2d6df1345b279f8dbe0834
tree6adc41f3db9ee45cea91e633250d67b8bf60267a
parent0ae4962ab9ec6abc5505c17b76c0d2160b958066
parentbde37e58e6f8efc01d6974cb400f3947f403046b
Merge branch 'stable' into pud

* stable:
  smart gateway: add threshold configuration parameter
  smart gateway: all parameters of smartgw_tunnel_monitor are unused
  smart gateway: remove useless code in smartgw_tunnel_monitor
  smart gateway: remove duplicated calls
  smart gateway: fix spelling of 'lazy'
  linux: tunnel: report tunnel setup too
  gui: linux: align olsr_ip_addr to olsr definition of it