Merge branch 'master' of debian@coreander:/srv/git/source.jones.dk/ikiwiki

Manually solved conflicts:

	Makefile

1 files changed, 2 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index f513eea..30f5960 100644
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,8 @@ $(1):
 		git init && \
 		git remote add -f -t $$(master) -m $$(master) origin $$(origin) && \
 		git merge origin && \
-		git config remote.origin.push +refs/heads/master:refs/heads/$$(master); \
+		git branch -m $$(master) && \
+		git config remote.origin.push +refs/heads/$$(master):refs/heads/$$(master); \
 	fi