Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Tue, 27 Aug 2013 14:10:50 +0200
changeset 21029 ff012afdf452
parent 21019 327ce5aac264 (current diff)
parent 21028 d215bdedc1fc (diff)
child 21038 ea140535a56f
Merge back from main
src-db/database/sourcedata/AD_MODULE.xml
--- a/.hgsigs	Tue Aug 27 08:32:17 2013 +0200
+++ b/.hgsigs	Tue Aug 27 14:10:50 2013 +0200
@@ -118,4 +118,5 @@
 5efe3c4189c7db9b2ea2bdff73de3256217df045 0 iEYEABECAAYFAlHNMRQACgkQCX/oGf+2qkPkMACfSJJJM2kdf89Up4kfEbCZW/smRIEAoKbC5gBEuEKdflRQU5ber6TXErjQ
 b92ea05d4f9df44475cc35b00682862d15f7880d 0 iEYEABECAAYFAlHfwu0ACgkQCX/oGf+2qkNDwgCeKTGDEeOXONV0dU9Br2RZAwEOFsMAn3okxXa3sdQk63JiB5PfPtBF6VLI
 d49b59c48d5f7d47d9d9505d2cf0ea5ea89b7070 0 iEYEABECAAYFAlHjfZMACgkQCX/oGf+2qkNnbgCg33P3BC6aXRRMGxtrdjpaugceKtUAoO6Nyy5jm/dx2xWnWBzg8u+F48BJ
+89f547d49965f4aa1655ffa55c255e3915e495ae 0 iEYEABECAAYFAlIW2pcACgkQCX/oGf+2qkPmqACfZHCZ8LJyiXgaIUckvvUncGCEkTQAoLbrEvRyCAYDpSKcN6zX/MMzo4pg
 25c6c6b0acf9bc7dc91e39a5c7171d391354366f 0 iEYEABECAAYFAlIJt2EACgkQCX/oGf+2qkNshACg9Vi913GItU4PNXC2H0MqGKJnMQsAniAnZcbGlfjD0YbFourNSNs9rfl+
--- a/.hgtags	Tue Aug 27 08:32:17 2013 +0200
+++ b/.hgtags	Tue Aug 27 14:10:50 2013 +0200
@@ -129,4 +129,5 @@
 fdd2929b3158b981bad058be133c560874629a1c 3.0MP24.1
 0e89a754cf5593dcec90d925c25534be68c38873 3.0MP24.2
 895ac3b1f59a66db37a45476a6a82cdca0564ee8 3.0MP25
+1f66ec4acb685f8645a2c429d1e27ddec604ca41 3.0MP25.1
 3ca2970a589227c6dfc3fbefe2650385ea7ddebc 3.0MP26