From: Sven Schöling <s.schoeling@linet-services.de>
Date: Wed, 3 Mar 2010 13:56:26 +0000 (+0100)
Subject: Merge branch 'master' of ssh://lx-office/~/lx-office-erp
X-Git-Tag: release-2.6.1beta1~44^2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=9ba051f59c5d02e82ca54ae19e3233f895058f9b;p=kivitendo-erp.git

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

Conflicts:
	doc/changelog
---

9ba051f59c5d02e82ca54ae19e3233f895058f9b
diff --cc doc/changelog
index 98ec43a58,59a04799d..b86f40ef6
--- a/doc/changelog
+++ b/doc/changelog
@@@ -158,10 -158,10 +158,10 @@@
  
    Liste gefixter Bugs aus dem Bugtracker:
  
 -  922 940 1024 1025 1028 1030 1031 1034 1035 1037 1040 1043 1044 1046
 -  1051 1055 1057 1058 1072 1073 1077 1081 1082 1095 1098 1100 1101
 -  1108 1110 1118 1125 1127 1130 1133 1136 1138 1147 1150 1151 1155
 -  1164 1177 1186 1188 1190 1191 1199 1201
 +  922 940 1024 1025 1028 1030 1031 1034 1035 1037 1040 1043 1044 1046 1051 1055
 +  1057 1058 1072 1073 1077 1081 1082 1095 1098 1100 1101 1108 1110 1118 1125
 +  1127 1130 1133 1135 1136 1138 1146 1147 1150 1151 1155 1164 1173 1177 1186
-   1190 1191 1199 1201
++  1188 1190 1191 1195 1199 1201
  
  
  2009-06-02 - Version 2.6.0