Merge branch '6.26-security' into 6.x
authorGábor Hojtsy
Wed, 19 Dec 2012 19:00:33 +0000 (20:00 +0100)
committerGábor Hojtsy
Wed, 19 Dec 2012 19:00:33 +0000 (20:00 +0100)
1  2 
includes/common.inc
includes/file.inc
modules/system/system.module
modules/user/user.module

Simple merge
Simple merge
Simple merge
Simple merge