Merge branch '7.18-security' into 7.x
authorDavid Rothstein
Wed, 16 Jan 2013 21:56:53 +0000 (16:56 -0500)
committerDavid Rothstein
Wed, 16 Jan 2013 21:56:53 +0000 (16:56 -0500)
commitca55fc249ca2edba301ba426579376c94f4258f4
treef1a695a5c37e85f4d186e60bcb070f1636233f88
parenta03edeb357816e1fa68586e1fef5be0d8f5257c3
parent1d4604da252f0e6e19339957ec214388f61b908d
Merge branch '7.18-security' into 7.x
CHANGELOG.txt
includes/bootstrap.inc
modules/book/book.pages.inc
modules/book/book.test