Links
Merge remote-tracking branch 'origin/master'

Conflicts:
	news/2013-06-28-announcing-1-0-0-beta2.md