From 8a616c5e6d2a56b2aee5a10d68c27b99458a2c77 Mon Sep 17 00:00:00 2001
From: michael pereira
Date: Tue, 29 Mar 2011 11:21:38 +0200
Subject: merges
---
.zfproject.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to '.zfproject.xml')
diff --git a/.zfproject.xml b/.zfproject.xml
index 262f79c..c7a4807 100644
--- a/.zfproject.xml
+++ b/.zfproject.xml
@@ -316,6 +316,7 @@
+
@@ -331,9 +332,9 @@
-
+
--
cgit v1.2.3-55-g7522