Merge branch '6.22-security' into 6.x
authorGábor Hojtsy
Wed, 1 Feb 2012 21:35:41 +0000 (22:35 +0100)
committerGábor Hojtsy
Wed, 1 Feb 2012 21:35:41 +0000 (22:35 +0100)
1  2 
includes/common.inc
modules/system/system.module

Simple merge
Simple merge