Merge branch 'master' (early part) into debian-release

* 'master' (early part):
  Adding log samples accumulated in Debian branch
  BF: removing minor bashism in ipmasq example file (closes: #530078). Thanks Raphael Geissert
  Added ipmasq rule file to restart fail2ban when iptables are wiped out (closes: #461417). Thanks Guido Bozzetto
  added rudimentary .gitignore
  BF: be able to detect time for VNC recording only 2 letters of year (closes: #537610)
pull/23/head
Yaroslav Halchenko 2011-11-18 11:59:08 -05:00
commit 40fbb55044

Diff Content Not Available