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)
commit7bc653b2ed5137658c2318ced5ab97a6d07bf77b
tree3c03334bbb0ee4d3d7eebe6e2de89e6f0516c6e1
parent04274d4fa4e8f34b215561c962160c3e5b85c582
parentda8023a98808d243a03d494750a30d06dd1827cc
Merge branch '6.26-security' into 6.x
includes/common.inc
includes/file.inc
modules/system/system.module
modules/user/user.module