LHitomi

11/08/2014
antes das alterações
wp

wp
Merge remote-tracking branch 'origin/master'

Conflicts:
	wordpress/wp-content/themes/ne_v2.1/imagens/_notes/dwsync.xml
	wordpress/wp-content/themes/ne_v2.1/images/_notes/dwsync.xml
	wordpress/wp-content/themes/ne_v2.1/page.php