Colton Myers 25f9b2d2d1 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: doc/topics/cloud/action.rst doc/topics/cloud/function.rst doc/topics/reactor/index.rst		2015-04-07 10:05:35 -06:00
..
index.rst	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-04-07 10:05:35 -06:00