Merge branch 'css-shorthand-2013-07-05' of https://github.com/gibson042/api.jquery.com into gibson042-css-shorthand-2013-07-05

* 'css-shorthand-2013-07-05' of https://github.com/gibson042/api.jquery.com:
  jQuery #13421 et al.: add detail to CSS shorthand properties note

Conflicts:
	entries/css.xml

Author: kswedberg