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)
commit3f7e90728e9b558b855c27e96196dd817fc136a6
tree4afe65e53ac152beb2640227ae1ac6b30524b149
parent100f9332f1b3c37d91a388ae4cf080482dbaea2b
parent10edcf72444e58b2032957edd3d478ac2d431b0c
Merge branch '6.22-security' into 6.x
includes/common.inc
modules/system/system.module