IIX AS112 docs
Merge branch 'master' of https://github.com/inex/IXP-Manager
Update IIX AS112 docs
[IM] Make Smokeping more configurable for multi-IXP mode
Merge branch 'master' of https://github.com/inex/IXP-Manager

Conflicts:
	library/IXP/Controller/CliAction.php
Smokeping template fix
Do not show p2p links if it is not enabled
Changelog update
[NF] TACACS configuration imported from Perl scripts (first pass)
Merge branch 'nf-tacacs'
Better documentation and a dummy functiion for RADIUS conf
Update changelog
TACACS conf
Revert "TACACS conf"

This reverts commit 6efb0a21037620c6f54e38dd606a69246c8c9260.
Revert "Revert "TACACS conf""

This reverts commit 38179b37c7f01a345f42a8e495fbc859c39d9e23.
Keep the key out of public repos
Fix ignore pattern
Update foreign refs
Version bump
[HK] Migrate Nagios config to dedicated controller

Also create reference point for INEX working config to compare to future changes.