about
调整
调整
调整
Merge branch 'master' of github.com:yanzj/matchbox

Conflicts:
	trunk/web/wp-content/themes/matchbox_mobile/content-aside.php
	trunk/web/wp-content/themes/matchbox_mobile/content-image.php
	trunk/web/wp-content/themes/matchbox_mobile/css/site-style.css
	trunk/web/wp-content/themes/matchbox_mobile/footer.php
	trunk/web/wp-content/themes/matchbox_mobile/functions.php
	trunk/web/wp-content/themes/matchbox_mobile/header.php
	trunk/web/wp-content/themes/matchbox_mobile/index.php