merge updates
authorgraghava <gopal.1.raghavan@nokia.com>
Tue, 06 Dec 2011 13:51:21 -0500
changeset 12 cde48ddfd8a5
parent 11 efb1c7c42af7 (current diff)
parent 10 7226a4334cea (diff)
child 13 e6282e7a4947
merge updates
--- a/about.txt	Tue Dec 06 13:43:40 2011 -0500
+++ b/about.txt	Tue Dec 06 13:51:21 2011 -0500
@@ -0,0 +1,1 @@
+foo
--- a/tests/csp/csp-self.php	Tue Dec 06 13:43:40 2011 -0500
+++ b/tests/csp/csp-self.php	Tue Dec 06 13:51:21 2011 -0500
@@ -1,3 +1,3 @@
 <?php
 header("X-Content-Security-Policy: allow 'self'");
-?>
\ No newline at end of file
+?>