fail config
Merge branch 'master' of https://github.com/sandr0ne/fail2ban

Conflicts:
	config/config.php

merge config
Merge branch 'master' of https://github.com/sandr0ne/fail2ban

sadadasd
Merge branch 'master' of https://github.com/sandr0ne/fail2ban