..
Merge branch 'master' of github.com:inewswire/piwik

Conflicts:
	config/config.ini.php