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