Fix for issue #304
Merge pull request #305 from koeppea/token-fix

Fix for issue #304
Merge pull request #306 from eaescob/263-fix

263 fix
New curl 7.32.0
Fixed some newline
Fixed ethereal->wireshark references
Patching cmake file, from nieder
Fixed issue #315
Switching to ps2pdf14 from ps2pdf13 for pdf file creation
Merge pull request #311 from LocutusOfBorg/drop-ethereal

Fixed ethereal->wireshark references
Merge pull request #314 from LocutusOfBorg/fix-mac

Patching cmake file, from nieder, switching to ps2pdf14 as default
Merge pull request #308 from LocutusOfBorg/fix-newline

Fixed some newline
Trying to fix issue #297
resolve ambiguous Gtk menu shortcut between Hosts and Help menu
Minor documentation typo fixed
Merge remote-tracking branch 'upstream/master' into fix-pcap2
rename help menu to '?'
Merge pull request #317 from koeppea/fix-menu-shortcut

resolve ambiguous Gtk menu shortcut between Hosts and Help menu
Fix atexit bad references
calling "exit" calls also the atexit functions!
FIXING issue #297