Merge branch 'master' into stable master-stable-switch
[olsrd.git] / gui /
drwxr-xr-x   ..
drwxr-xr-x - linux-gtk
drwxr-xr-x - win32