migrate pages
Merge branch 'master' of
https://github.com/mikeonthebike/gitwordpress.git

Conflicts:
	www/wp-content/plugins/migratepages/MigratePages.php