Merge pull request #1125 from crankycoder/features/1077-merge-header-files

Features/1077 merge header files
Merge branch 'less-log-spam' of github.com:garvankeeley/MozStumbler into less-log-spam