Merge branch 'skinnable-master' of ssh://shizuki@git.sourceforge.jp/gitroot/nucleus...

author shizuki <shizuki@kinezumi.net>

Tue, 29 May 2012 06:33:57 +0000 (15:33 +0900)

committer shizuki <shizuki@kinezumi.net>

Tue, 29 May 2012 06:33:57 +0000 (15:33 +0900)
author shizuki <shizuki@kinezumi.net>
Tue, 29 May 2012 06:33:57 +0000 (15:33 +0900)
committer shizuki <shizuki@kinezumi.net>
Tue, 29 May 2012 06:33:57 +0000 (15:33 +0900)
diff --cc nucleus/libs/ADMIN.php
Simple merge
diff --cc nucleus/libs/AdminActions.php
Simple merge
author	shizuki <shizuki@kinezumi.net>
	Tue, 29 May 2012 06:33:57 +0000 (15:33 +0900)
committer	shizuki <shizuki@kinezumi.net>
	Tue, 29 May 2012 06:33:57 +0000 (15:33 +0900)
		1	2
nucleus/libs/ADMIN.php	patch \|	diff1 \|	diff2 \|	blob \| history
nucleus/libs/AdminActions.php	patch \|	diff1 \|	diff2 \|	blob \| history