edit
delete
Merge branch 'master' of https://github.com/spacingliu/spacing

Conflicts:
	dongliang/app/cache/metadata/zend_cache---67ba39b116cccae1e0bb2b0c0c5fa8ae
	dongliang/app/cache/metadata/zend_cache---internal-metadatas---0138967cd199b3b30c4d39ab3334904b
	dongliang/app/cache/metadata/zend_cache---internal-metadatas---3aae1fbe3c1e63d55a18c37a27d34c83
	dongliang/app/cache/metadata/zend_cache---internal-metadatas---49eb91f45b379a3125ac6ab75fa7e28d
	dongliang/app/cache/metadata/zend_cache---internal-metadatas---67ba39b116cccae1e0bb2b0c0c5fa8ae
	dongliang/app/cache/metadata/zend_cache---internal-metadatas---d1530a2e719cdf70f664fadac474ad76
	dongliang/app/cache/metadata/zend_cache---internal-metadatas---f19521e700cb798b935e45ef22ba374a
	dongliang/app/cache/metadata/zend_cache---internal-metadatas---fe30703034a57a1500080331af72fa34