Marcus Franke fix.

git-svn-id: http://plugins.svn.wordpress.org/custom-post-type-permalinks/trunk@702383 b8457f37-d9ea-0310-8a92-e5e31aec5664
wpml fix

git-svn-id: http://plugins.svn.wordpress.org/custom-post-type-permalinks/trunk@702385 b8457f37-d9ea-0310-8a92-e5e31aec5664
version up

git-svn-id: http://plugins.svn.wordpress.org/custom-post-type-permalinks/trunk@702386 b8457f37-d9ea-0310-8a92-e5e31aec5664
delete svn message

git-svn-id: http://plugins.svn.wordpress.org/custom-post-type-permalinks/trunk@702387 b8457f37-d9ea-0310-8a92-e5e31aec5664
Marcus Franke fix.

git-svn-id: http://plugins.svn.wordpress.org/custom-post-type-permalinks/trunk@702396 b8457f37-d9ea-0310-8a92-e5e31aec5664
wpml fix

git-svn-id: http://plugins.svn.wordpress.org/custom-post-type-permalinks/trunk@702398 b8457f37-d9ea-0310-8a92-e5e31aec5664
set permalink

git-svn-id: http://plugins.svn.wordpress.org/custom-post-type-permalinks/trunk@702399 b8457f37-d9ea-0310-8a92-e5e31aec5664
パーマリンクの生成周りを変更。

git-svn-id: http://plugins.svn.wordpress.org/custom-post-type-permalinks/trunk@702400 b8457f37-d9ea-0310-8a92-e5e31aec5664
wpml fix

git-svn-id: http://plugins.svn.wordpress.org/custom-post-type-permalinks/trunk@702401 b8457f37-d9ea-0310-8a92-e5e31aec5664
Merge branch 'master' of github.com:Toro-Unit/custom-post-type-permalinks

Conflicts:
	readme.txt