Merge branch '6.26-security' into 6.x

author Gábor Hojtsy

Wed, 19 Dec 2012 19:00:33 +0000 (20:00 +0100)

committer Gábor Hojtsy

Wed, 19 Dec 2012 19:00:33 +0000 (20:00 +0100)
author Gábor Hojtsy
Wed, 19 Dec 2012 19:00:33 +0000 (20:00 +0100)
committer Gábor Hojtsy
Wed, 19 Dec 2012 19:00:33 +0000 (20:00 +0100)
diff --cc includes/common.inc
Simple merge
diff --cc includes/file.inc
Simple merge
diff --cc modules/system/system.module
Simple merge
diff --cc modules/user/user.module
Simple merge
		1	2
includes/common.inc	patch \|	diff1 \|	diff2 \|	blob \| history
includes/file.inc	patch \|	diff1 \|	diff2 \|	blob \| history
modules/system/system.module	patch \|	diff1 \|	diff2 \|	blob \| history
modules/user/user.module	patch \|	diff1 \|	diff2 \|	blob \| history