Zhimin YE (Rex) dd4e887b47 Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/upgrade.jade
2016-06-02 08:58:19 +01:00
..