Merge branch 'master' of git://andersk.mit.edu/test

Conflicts:
	test.txt

diff --git a/test.txt b/test.txt
index 257cc5642cb1a054f08cc83f2d943e56fd3ebe99..76018072e09c5d31c8c6e3113b8aa0fe625195ca 100644 (file)
--- a/test.txt
+++ b/test.txt
@@ -1 +1 @@
-foo
+baz