Thu Aug 28 14:26:55 CEST 2014
Merge branch 'master' of github.com:fliphess/raspi-ansible-config

Conflicts:
	LINKS