# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1320218246 0
# Node ID cf4e49b250c7c3d0e66be2e7d3bca602a0ca4969
# Parent  2928a74357c89f53c2ddfe0179bb42447f428f8a# Parent  c8f7ae9381cd9063bb3ce1545d4083fefec41716
Merge with Zash

diff -r c8f7ae9381cd -r cf4e49b250c7 Makefile
--- a/Makefile	Wed Nov 02 00:00:42 2011 +0500
+++ b/Makefile	Wed Nov 02 07:17:26 2011 +0000
@@ -63,6 +63,7 @@
 	sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' $^ > $@
 
 prosody.version: $(wildcard prosody.release .hg/dirstate)
-	test -e .hg/dirstate && hexdump -n6 -e'6/1 "%02x"' .hg/dirstate \
-		> $@
-	test -f prosody.release && cp prosody.release $@ || true
+	test -e .hg/dirstate && \
+		hexdump -n6 -e'6/1 "%02x"' .hg/dirstate > $@ || true
+	test -f prosody.release && \
+		cp prosody.release $@ || true