Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Fri, 14 Feb 2014 10:18:02 +0100
changeset 22038 e6196eede0f8
parent 22018 12b3d243b293 (current diff)
parent 22037 34d2a2f6f7d3 (diff)
child 22039 cac61a7acbc6
Merge back from main
src-db/database/sourcedata/AD_MODULE.xml
--- a/.hgsigs	Wed Feb 05 15:01:07 2014 +0530
+++ b/.hgsigs	Fri Feb 14 10:18:02 2014 +0100
@@ -143,3 +143,4 @@
 eb8e78cfd919a9685a7c62d95dea0c33da5cd020 0 iEYEABECAAYFAlLfapIACgkQCX/oGf+2qkOsgQCfZ++nSoqIqaQLLAq8xjW7qzJG3pUAn0+PMbOjJt6kpXwYS8llobEit6Pw
 dabb8fba63b9659c127420f07461871b3c9bebda 0 iEYEABECAAYFAlL8P1gACgkQCX/oGf+2qkOoYwCg/3/+oc1NxA/d8WSRpVMs0TYNOQwAoKUC5zxZqvJk+LivRSN/+eskflS7
 2cbbd8417ae97c721014374b56300f9359801fc2 0 iEYEABECAAYFAlLX0sMACgkQCX/oGf+2qkPBDgCeOEYN+sAUu4baZ1tz3jNaubocaCcAoL/oSf0PxmUybuQg3kMSTINTsbOt
+43f6f77b25a9c7d51084945606d9047edc330fd9 0 iEYEABECAAYFAlL8iUMACgkQCX/oGf+2qkNl7ACfSjVPsngbBzCPO8LvR265DeT4c/QAni8NT/G2mfMPQIToawozPiOKNtQl
--- a/.hgtags	Wed Feb 05 15:01:07 2014 +0530
+++ b/.hgtags	Fri Feb 14 10:18:02 2014 +0100
@@ -154,3 +154,4 @@
 80961289f4cd77842d94594c7e3b05be7fbcb845 3.0MP30.2
 305302e510c295adf7ac53425f45a64a8bb6f2b2 3.0MP30.3
 e6661b2604e820c2df1269029e688e49d611a1e7 3.0MP31
+510340c73c5073cf20afd52a02e411cebdc017f6 3.0MP31.1