# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1319669881 14400
# Node ID 424e14d3f99bd50627fcfe1226f8f73ee5ced6ef
# Parent  5356664ef9d4d00d129c638baccb1dd6996a3058# Parent  e7c501d203b0aef4c8d85893ef237ce66ee0131f
Merge with Zash

diff -r 5356664ef9d4 -r 424e14d3f99b Makefile
--- a/Makefile	Wed Oct 26 18:55:06 2011 -0400
+++ b/Makefile	Wed Oct 26 18:58:01 2011 -0400
@@ -63,7 +63,6 @@
 	sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' $^ > $@
 
 prosody.version: $(wildcard prosody.release .hg/dirstate)
-	test -e .hg/dirstate && \
-		hexdump -n6 -e'6/1 "%02x"' .hg/dirstate > $@ || true
-	test -f prosody.release && \
-		cp prosody.release $@ || true
+	test -e .hg/dirstate && hexdump -n6 -e'6/1 "%02x"' .hg/dirstate \
+		> $@
+	test -f prosody.release && cp prosody.release $@ || true