From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 29 Apr 2011 11:26:48 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yazpp
X-Git-Tag: v1.2.5~1
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=a60c186e884b033ed25db9cd5775d72272e4b3d6;hp=29388f5e9e3bd4bb5f0e375cdc560869be840d86;p=yazpp-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yazpp

Conflicts:
	IDMETA
---

diff --git a/IDMETA b/IDMETA
index 423a6de..86664dc 100644
--- a/IDMETA
+++ b/IDMETA
@@ -1,2 +1,2 @@
-DEBIAN_DIST="squeeze lenny"
-UBUNTU_DIST="maverick lucid karmic"
+DEBIAN_DIST="wheezy squeeze lenny"
+UBUNTU_DIST="natty maverick lucid karmic"
diff --git a/m4 b/m4
index f7d7eb4..1fa0b45 160000
--- a/m4
+++ b/m4
@@ -1 +1 @@
-Subproject commit f7d7eb4b44b7fdad1942e32856d6afc2e6dcabda
+Subproject commit 1fa0b45a8141955801938f967f1d1dca1b042c17