Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Tue, 27 Aug 2013 16:12:45 +0200
changeset 21038 ea140535a56f
parent 21029 ff012afdf452 (current diff)
parent 21037 4e6fe9d710f4 (diff)
child 21039 aa3e09dbd8a8
Merge back from main
src-db/database/sourcedata/AD_MODULE.xml
--- a/.hgsigs	Tue Aug 27 14:10:50 2013 +0200
+++ b/.hgsigs	Tue Aug 27 16:12:45 2013 +0200
@@ -120,3 +120,4 @@
 d49b59c48d5f7d47d9d9505d2cf0ea5ea89b7070 0 iEYEABECAAYFAlHjfZMACgkQCX/oGf+2qkNnbgCg33P3BC6aXRRMGxtrdjpaugceKtUAoO6Nyy5jm/dx2xWnWBzg8u+F48BJ
 89f547d49965f4aa1655ffa55c255e3915e495ae 0 iEYEABECAAYFAlIW2pcACgkQCX/oGf+2qkPmqACfZHCZ8LJyiXgaIUckvvUncGCEkTQAoLbrEvRyCAYDpSKcN6zX/MMzo4pg
 25c6c6b0acf9bc7dc91e39a5c7171d391354366f 0 iEYEABECAAYFAlIJt2EACgkQCX/oGf+2qkNshACg9Vi913GItU4PNXC2H0MqGKJnMQsAniAnZcbGlfjD0YbFourNSNs9rfl+
+03423edd830d99ac30c5938c915bd59b5805f39c 0 iEYEABECAAYFAlIXIXMACgkQCX/oGf+2qkOBnQCfVTDJFemSCCNyONytrElhgPzT7SEAnimrHqNU+GRUeeMHaY+/cVoYAwRD
--- a/.hgtags	Tue Aug 27 14:10:50 2013 +0200
+++ b/.hgtags	Tue Aug 27 16:12:45 2013 +0200
@@ -131,3 +131,4 @@
 895ac3b1f59a66db37a45476a6a82cdca0564ee8 3.0MP25
 1f66ec4acb685f8645a2c429d1e27ddec604ca41 3.0MP25.1
 3ca2970a589227c6dfc3fbefe2650385ea7ddebc 3.0MP26
+28fa441122298d5cd7cabe28490ec7d6435e7809 3.0MP26.1