From: Sven Schöling <s.schoeling@linet-services.de>
Date: Thu, 4 Mar 2010 09:32:47 +0000 (+0100)
Subject: Merge branch 'master' of ssh://lx-office/~/lx-office-erp
X-Git-Tag: release-2.6.1beta1~33^2~11^2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=8f29628f54e8b6669cdefa6e43e2f54220760c3c;p=kivitendo-erp.git

Merge branch 'master' of ssh://lx-office/~/lx-office-erp

Conflicts:
	doc/changelog
---

8f29628f54e8b6669cdefa6e43e2f54220760c3c
diff --cc doc/changelog
index 51010e5a5,1b43c31c8..a7abfe402
--- a/doc/changelog
+++ b/doc/changelog
@@@ -162,7 -163,7 +163,7 @@@
    1044 1046 1051 1055 1057 1058 1072 1073 1077 1079 1081 1082 1095 1098
    1100 1101 1108 1110 1118 1125 1127 1130 1133 1135 1136 1138 1144
    1146 1147 1150 1151 1155 1164 1173 1177 1186 1188 1190 1191 1195
-   1197 1199 1200 1201 1209
 -  1197 1198 1199 1200 1201 1250 1289
++  1197 1198 1199 1200 1201 1209 1250 1289
  
  
  2009-06-02 - Version 2.6.0