Rollup merge of #22719 - steveklabnik:typo_fix, r=alexcrichton

author Manish Goregaokar <manishsmail@gmail.com>

Tue, 24 Feb 2015 01:43:41 +0000 (07:13 +0530)

committer Manish Goregaokar <manishsmail@gmail.com>

Tue, 24 Feb 2015 06:38:32 +0000 (12:08 +0530)
author Manish Goregaokar <manishsmail@gmail.com>
Tue, 24 Feb 2015 01:43:41 +0000 (07:13 +0530)
committer Manish Goregaokar <manishsmail@gmail.com>
Tue, 24 Feb 2015 06:38:32 +0000 (12:08 +0530)
diff --cc src/doc/trpl/static-and-dynamic-dispatch.md
Simple merge
author	Manish Goregaokar <manishsmail@gmail.com>
	Tue, 24 Feb 2015 01:43:41 +0000 (07:13 +0530)
committer	Manish Goregaokar <manishsmail@gmail.com>
	Tue, 24 Feb 2015 06:38:32 +0000 (12:08 +0530)