Merge branch 'release-0.6.5'
authorFerry Huberts <ferry.huberts@pelagic.nl>
Thu, 31 Jan 2013 12:42:07 +0000 (13:42 +0100)
committerFerry Huberts <ferry.huberts@pelagic.nl>
Thu, 31 Jan 2013 12:42:07 +0000 (13:42 +0100)
commit142b0750b8a355fd6f1c9a05b85e6594b22ebbc6
tree9522f21e3c57c68dc01a457f0afa473655cb313b
parentd95b3c0aa10ef1a1f3775be835bb8f9d1e4d901b
parent3fa0cc7f6adcdb61ae5a231a05ab3463b2489df6
Merge branch 'release-0.6.5'

* release-0.6.5:
  main: fix pidfile compilation on windows
  main: add -pidfile command line option
  gateway: always select a new gateway when threshold != 0
  gateway: fix stable count dampening in gw_default_timer
  android: fix the path of the tunnel node in the /dev tree
  gateway: fix a revert problem
  Revert "linux: name is required to be non-null in olsr_os_cleanup_iptunnel"