Merge branch 'master' into skinnable-master

author sakamocchi <o-takashi@sakamocchi.jp>

Tue, 10 Apr 2012 14:47:35 +0000 (23:47 +0900)

committer sakamocchi <o-takashi@sakamocchi.jp>

Tue, 10 Apr 2012 14:47:35 +0000 (23:47 +0900)
author sakamocchi <o-takashi@sakamocchi.jp>
Tue, 10 Apr 2012 14:47:35 +0000 (23:47 +0900)
committer sakamocchi <o-takashi@sakamocchi.jp>
Tue, 10 Apr 2012 14:47:35 +0000 (23:47 +0900)
diff --cc nucleus/libs/PAGEFACTORY.php
Simple merge
diff --cc nucleus/libs/globalfunctions.php
Simple merge
diff --cc nucleus/libs/i18n.php
Simple merge
author	sakamocchi <o-takashi@sakamocchi.jp>
	Tue, 10 Apr 2012 14:47:35 +0000 (23:47 +0900)
committer	sakamocchi <o-takashi@sakamocchi.jp>
	Tue, 10 Apr 2012 14:47:35 +0000 (23:47 +0900)
		1	2
nucleus/libs/PAGEFACTORY.php	patch \|	diff1 \|	diff2 \|	blob \| history
nucleus/libs/globalfunctions.php	patch \|	diff1 \|	diff2 \|	blob \| history
nucleus/libs/i18n.php	patch \|	diff1 \|	diff2 \|	blob \| history