Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Fri, 18 Oct 2013 14:04:20 +0200
changeset 21319 19905ef8e834
parent 21318 eb0f3ecbdae4 (current diff)
parent 21316 042903f9389b (diff)
child 21320 dc377101bd1b
Merge back from main
src-db/database/sourcedata/AD_MODULE.xml
--- a/.hgsigs	Thu Oct 17 18:20:43 2013 +0200
+++ b/.hgsigs	Fri Oct 18 14:04:20 2013 +0200
@@ -126,3 +126,4 @@
 92028616e00a984620b7b5cb5185d5347a7d8e27 0 iEYEABECAAYFAlJWJuwACgkQCX/oGf+2qkOI6wCgpWwN1yrx+LccTz/Unl85E/iB1lkAoKkM5ffnfpaOxl+sSPqCwHfS7oDe
 b79dd1dc55aa66c08d26a88c004c167253307b9a 0 iEYEABECAAYFAlIyoXQACgkQCX/oGf+2qkPMWACg2suFjCYsdws4IU2H5S0wdXHkI+MAnjiRIQd2XaN/Yw6iAsj6jgI+y3Bx
 f56c14fc0212d08ec0e9663d957dfdbf4ff42543 0 iEYEABECAAYFAlJbyIkACgkQCX/oGf+2qkOXiACgggW09+Z5WL1BrxaSVcZB0ykapr4AoKSn91Y1yvImj5/sEmdM5f37Y2RM
+ffdd47e41d59e56bf2f85033679accff7feaa941 0 iEYEABECAAYFAlJfscwACgkQCX/oGf+2qkOJFQCg/olIlg4QV8DcH3aJWB9NVlpgvG4An1P8ZPJjX7Rtaav0sb+N1DF9YaSh
--- a/.hgtags	Thu Oct 17 18:20:43 2013 +0200
+++ b/.hgtags	Fri Oct 18 14:04:20 2013 +0200
@@ -137,3 +137,4 @@
 f731bd4e0332d5976149e92aed53d49ed1852557 3.0MP26.3
 5bc4ca20d6f5c30e0cb179912df555607df04577 3.0MP27
 db86a9cfecc308c3382feb357d53091f51ad3a4a 3.0MP28
+750dc95742e0d15c3ed8b484fa8dbc4aa689c627 3.0MP28.1