Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Mon, 21 Oct 2013 09:33:47 +0200
changeset 21330 0231591bd78a
parent 21329 8b2148029cf3 (current diff)
parent 21328 00b998ac4015 (diff)
child 21331 cf31b113f28f
Merge back from main
src-db/database/sourcedata/AD_MODULE.xml
--- a/.hgsigs	Fri Oct 18 21:36:20 2013 +0200
+++ b/.hgsigs	Mon Oct 21 09:33:47 2013 +0200
@@ -124,6 +124,7 @@
 03423edd830d99ac30c5938c915bd59b5805f39c 0 iEYEABECAAYFAlIXIXMACgkQCX/oGf+2qkOBnQCfVTDJFemSCCNyONytrElhgPzT7SEAnimrHqNU+GRUeeMHaY+/cVoYAwRD
 2cba8a4800b004a03d6bdc1863084421a17a496e 0 iEYEABECAAYFAlIoL7sACgkQCX/oGf+2qkPyTQCfVLRC/dJweMhAtUQUf0ysLeJuU1YAoMjPgLwhtEHs7DYZKMGkgrRKxfUP
 92028616e00a984620b7b5cb5185d5347a7d8e27 0 iEYEABECAAYFAlJWJuwACgkQCX/oGf+2qkOI6wCgpWwN1yrx+LccTz/Unl85E/iB1lkAoKkM5ffnfpaOxl+sSPqCwHfS7oDe
+1216d879483850c7a6ebd1b87b989bbdfebc7f38 0 iEYEABECAAYFAlJhLy0ACgkQCX/oGf+2qkPOzQCeKwXy9EQPSyYq/b5eALoFRQsHescAoL8RolWFBxkn+CGl4yR5gBgBp7mR
 b79dd1dc55aa66c08d26a88c004c167253307b9a 0 iEYEABECAAYFAlIyoXQACgkQCX/oGf+2qkPMWACg2suFjCYsdws4IU2H5S0wdXHkI+MAnjiRIQd2XaN/Yw6iAsj6jgI+y3Bx
 f56c14fc0212d08ec0e9663d957dfdbf4ff42543 0 iEYEABECAAYFAlJbyIkACgkQCX/oGf+2qkOXiACgggW09+Z5WL1BrxaSVcZB0ykapr4AoKSn91Y1yvImj5/sEmdM5f37Y2RM
 ffdd47e41d59e56bf2f85033679accff7feaa941 0 iEYEABECAAYFAlJfscwACgkQCX/oGf+2qkOJFQCg/olIlg4QV8DcH3aJWB9NVlpgvG4An1P8ZPJjX7Rtaav0sb+N1DF9YaSh
--- a/.hgtags	Fri Oct 18 21:36:20 2013 +0200
+++ b/.hgtags	Mon Oct 21 09:33:47 2013 +0200
@@ -135,6 +135,7 @@
 28fa441122298d5cd7cabe28490ec7d6435e7809 3.0MP26.1
 1e51c66c0c395e41fc5384608dcd539a255c210d 3.0MP26.2
 f731bd4e0332d5976149e92aed53d49ed1852557 3.0MP26.3
+98e29b4482b8200f26d0409b025ee58a5ead5a05 3.0MP26.4
 5bc4ca20d6f5c30e0cb179912df555607df04577 3.0MP27
 db86a9cfecc308c3382feb357d53091f51ad3a4a 3.0MP28
 750dc95742e0d15c3ed8b484fa8dbc4aa689c627 3.0MP28.1