Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Thu, 19 Jun 2014 13:59:33 +0200
changeset 23545 37f8decbe3fc
parent 23544 bca4e0f2c265 (current diff)
parent 23537 0efd4699f293 (diff)
child 23546 1e0221328796
child 23847 f94f08e02e3a
Merge back from main
src-db/database/sourcedata/AD_MODULE.xml
--- a/.hgsigs	Thu Jun 19 11:53:52 2014 +0530
+++ b/.hgsigs	Thu Jun 19 13:59:33 2014 +0200
@@ -149,3 +149,4 @@
 edac701bed6828715cff776651dac79d309674ca 0 iEYEABECAAYFAlOWq2kACgkQCX/oGf+2qkOzsQCfQUbf6PPjT2hXJz31XB7Wnn6vXUUAn0BB3aVsVa2uqv+VxNdO1GlAd+MN
 82edc3e63e3d23403efb378924c8e8f991c73cfc 0 iEYEABECAAYFAlNjfr0ACgkQCX/oGf+2qkPLVwCgowJ6SZ7/i3HJzN7KzIEqRxY60+MAoJbXOSIqx3xHRoG/yeZSdSST8zIV
 7de34ade782eae3f74b2df2471292e0da145eb47 0 iEYEABECAAYFAlN95g4ACgkQCX/oGf+2qkO62ACg74llt2Ngb7UyteX/drSuZ6/U8mIAn2I3sFYMtTZ3jzjR5zGOJ3M8/Ah0
+e6d5de2bb5e230b5a9d6d95489292a8e92de1764 0 iEYEABECAAYFAlOhX0gACgkQCX/oGf+2qkOgGACg3wrp9HA+P7exN/j+Znu5acph2psAn1XulrvCL3RJ0r2iNyeVqaY73OtQ
--- a/.hgtags	Thu Jun 19 11:53:52 2014 +0530
+++ b/.hgtags	Thu Jun 19 13:59:33 2014 +0200
@@ -160,3 +160,4 @@
 8f75794bc0d9e07225605892bb036f89f82070b0 3.0MP31.4
 2dac23c5332cf7fab337385841dcd65e9eaf78c0 3.0PR14Q2
 6b79b2cff11381014860b41d7db9c3835c87069b 3.0PR14Q2.1
+10a75a864b9d99c5f92d913f6d29255a5b0241cb 3.0PR14Q2.2